From 4ce8a195ba3ace07f48c5d2da637f513a3e56db9 Mon Sep 17 00:00:00 2001 From: Eric Williams Date: Tue, 26 Mar 2019 10:02:00 -0400 Subject: Bug 545793: [GTK] Remove 32-bit code Remove /*int*/ casts. Change-Id: I9e8da81d6435312acdd06cd1b3e471275ca842a8 Signed-off-by: Eric Williams --- .../gtk/org/eclipse/swt/awt/SWT_AWT.java | 12 +- .../org/eclipse/swt/accessibility/Accessible.java | 16 +- .../swt/accessibility/AccessibleObject.java | 436 +- .../gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java | 2 +- .../gtk/org/eclipse/swt/dnd/Clipboard.java | 26 +- .../gtk/org/eclipse/swt/dnd/ClipboardProxy.java | 20 +- .../gtk/org/eclipse/swt/dnd/DragSource.java | 42 +- .../gtk/org/eclipse/swt/dnd/DropTarget.java | 40 +- .../gtk/org/eclipse/swt/dnd/FileTransfer.java | 18 +- .../gtk/org/eclipse/swt/dnd/HTMLTransfer.java | 2 +- .../gtk/org/eclipse/swt/dnd/ImageTransfer.java | 10 +- .../gtk/org/eclipse/swt/dnd/RTFTransfer.java | 2 +- .../org/eclipse/swt/dnd/TableDragSourceEffect.java | 22 +- .../org/eclipse/swt/dnd/TableDropTargetEffect.java | 8 +- .../gtk/org/eclipse/swt/dnd/TextTransfer.java | 4 +- .../gtk/org/eclipse/swt/dnd/TransferData.java | 4 +- .../org/eclipse/swt/dnd/TreeDragSourceEffect.java | 22 +- .../org/eclipse/swt/dnd/TreeDropTargetEffect.java | 8 +- .../gtk/org/eclipse/swt/dnd/URLTransfer.java | 2 +- .../swt/internal/dnd/gtk/ListDragSourceEffect.java | 22 +- .../Eclipse SWT OpenGL/glx/library/glx.c | 34 +- .../Eclipse SWT OpenGL/glx/library/glx_structs.c | 8 +- .../org/eclipse/swt/internal/opengl/glx/GLX.java | 30 +- .../swt/internal/opengl/glx/XVisualInfo.java | 2 +- .../gtk/org/eclipse/swt/opengl/GLCanvas.java | 36 +- .../Eclipse SWT PI/cairo/library/cairo.c | 398 +- .../Eclipse SWT PI/cairo/library/cairo_stats.c | 18 +- .../Eclipse SWT PI/cairo/library/cairo_stats.h | 18 +- .../Eclipse SWT PI/cairo/library/cairo_structs.c | 8 +- .../org/eclipse/swt/internal/cairo/Cairo.java | 456 +- .../eclipse/swt/internal/cairo/cairo_path_t.java | 2 +- .../Eclipse SWT PI/common/library/c.c | 317 +- .../Eclipse SWT PI/common/library/c_stats.c | 70 +- .../Eclipse SWT PI/common/library/c_stats.h | 70 +- .../common/org/eclipse/swt/internal/C.java | 44 +- .../common/org/eclipse/swt/internal/LONG.java | 4 +- .../Eclipse SWT PI/gtk/library/atk.c | 640 +- .../Eclipse SWT PI/gtk/library/atk_stats.c | 114 +- .../Eclipse SWT PI/gtk/library/atk_stats.h | 114 +- .../Eclipse SWT PI/gtk/library/atk_structs.c | 758 +-- .../Eclipse SWT PI/gtk/library/os.c | 6699 ++++++++------------ .../Eclipse SWT PI/gtk/library/os_stats.c | 418 +- .../Eclipse SWT PI/gtk/library/os_stats.h | 418 +- .../Eclipse SWT PI/gtk/library/os_structs.c | 336 +- .../swt/internal/accessibility/gtk/ATK.java | 140 +- .../internal/accessibility/gtk/AtkActionIface.java | 12 +- .../internal/accessibility/gtk/AtkAttribute.java | 4 +- .../accessibility/gtk/AtkComponentIface.java | 26 +- .../accessibility/gtk/AtkEditableTextIface.java | 14 +- .../accessibility/gtk/AtkHypertextIface.java | 6 +- .../internal/accessibility/gtk/AtkObjectClass.java | 48 +- .../accessibility/gtk/AtkSelectionIface.java | 16 +- .../internal/accessibility/gtk/AtkTableIface.java | 72 +- .../internal/accessibility/gtk/AtkTextIface.java | 44 +- .../internal/accessibility/gtk/AtkTextRange.java | 2 +- .../internal/accessibility/gtk/AtkValueIface.java | 8 +- .../gtk/org/eclipse/swt/internal/gtk/GDK.java | 804 +-- .../eclipse/swt/internal/gtk/GInterfaceInfo.java | 6 +- .../org/eclipse/swt/internal/gtk/GObjectClass.java | 14 +- .../gtk/org/eclipse/swt/internal/gtk/GTK.java | 2990 ++++----- .../org/eclipse/swt/internal/gtk/GTypeInfo.java | 14 +- .../org/eclipse/swt/internal/gtk/GTypeQuery.java | 2 +- .../org/eclipse/swt/internal/gtk/GdkEventAny.java | 2 +- .../eclipse/swt/internal/gtk/GdkEventButton.java | 6 +- .../eclipse/swt/internal/gtk/GdkEventCrossing.java | 4 +- .../eclipse/swt/internal/gtk/GdkEventFocus.java | 2 +- .../org/eclipse/swt/internal/gtk/GdkEventKey.java | 4 +- .../eclipse/swt/internal/gtk/GdkEventMotion.java | 6 +- .../swt/internal/gtk/GdkEventWindowState.java | 2 +- .../eclipse/swt/internal/gtk/GdkWindowAttr.java | 10 +- .../gtk/org/eclipse/swt/internal/gtk/Graphene.java | 12 +- .../swt/internal/gtk/GtkCellRendererClass.java | 6 +- .../eclipse/swt/internal/gtk/GtkTargetEntry.java | 2 +- .../eclipse/swt/internal/gtk/GtkWidgetClass.java | 6 +- .../gtk/org/eclipse/swt/internal/gtk/OS.java | 1304 ++-- .../eclipse/swt/internal/gtk/PangoAttribute.java | 2 +- .../org/eclipse/swt/internal/gtk/PangoItem.java | 10 +- .../eclipse/swt/internal/gtk/PangoLayoutLine.java | 4 +- .../eclipse/swt/internal/gtk/PangoLayoutRun.java | 4 +- .../org/eclipse/swt/internal/gtk/XAnyEvent.java | 6 +- .../gtk/org/eclipse/swt/printing/PrintDialog.java | 28 +- .../gtk/org/eclipse/swt/printing/Printer.java | 56 +- .../gtk/org/eclipse/swt/program/Program.java | 44 +- .../Eclipse SWT WebKit/gtk/library/webkitgtk.c | 1112 ++-- .../gtk/library/webkitgtk_structs.c | 92 +- .../gtk/org/eclipse/swt/browser/WebKit.java | 388 +- .../gtk/org/eclipse/swt/browser/WebkitGDBus.java | 78 +- .../swt/internal/webkit/JSClassDefinition.java | 30 +- .../org/eclipse/swt/internal/webkit/WebKitGTK.java | 634 +- .../cairo/org/eclipse/swt/graphics/Path.java | 22 +- .../cairo/org/eclipse/swt/graphics/Pattern.java | 4 +- .../common/org/eclipse/swt/internal/Callback.java | 8 +- .../common/org/eclipse/swt/widgets/Monitor.java | 2 +- .../org/eclipse/swt/widgets/TouchSource.java | 4 +- .../bidi/org/eclipse/swt/internal/BidiUtil.java | 6 +- .../gtk/org/eclipse/swt/graphics/Cursor.java | 20 +- .../gtk/org/eclipse/swt/graphics/Device.java | 62 +- .../gtk/org/eclipse/swt/graphics/Font.java | 8 +- .../gtk/org/eclipse/swt/graphics/GC.java | 180 +- .../gtk/org/eclipse/swt/graphics/GCData.java | 4 +- .../gtk/org/eclipse/swt/graphics/Image.java | 38 +- .../gtk/org/eclipse/swt/graphics/Region.java | 24 +- .../gtk/org/eclipse/swt/graphics/TextLayout.java | 90 +- .../gtk/org/eclipse/swt/internal/Converter.java | 10 +- .../gtk/org/eclipse/swt/internal/GDBus.java | 36 +- .../gtk/org/eclipse/swt/internal/ImageList.java | 32 +- .../gtk/org/eclipse/swt/widgets/Button.java | 52 +- .../gtk/org/eclipse/swt/widgets/Canvas.java | 46 +- .../gtk/org/eclipse/swt/widgets/Caret.java | 6 +- .../gtk/org/eclipse/swt/widgets/ColorDialog.java | 6 +- .../gtk/org/eclipse/swt/widgets/Combo.java | 202 +- .../gtk/org/eclipse/swt/widgets/Composite.java | 140 +- .../gtk/org/eclipse/swt/widgets/Control.java | 466 +- .../gtk/org/eclipse/swt/widgets/DateTime.java | 52 +- .../gtk/org/eclipse/swt/widgets/Decorations.java | 24 +- .../org/eclipse/swt/widgets/DirectoryDialog.java | 44 +- .../gtk/org/eclipse/swt/widgets/Display.java | 454 +- .../gtk/org/eclipse/swt/widgets/ExpandBar.java | 22 +- .../gtk/org/eclipse/swt/widgets/ExpandItem.java | 26 +- .../gtk/org/eclipse/swt/widgets/FileDialog.java | 46 +- .../gtk/org/eclipse/swt/widgets/FontDialog.java | 14 +- .../gtk/org/eclipse/swt/widgets/Group.java | 30 +- .../gtk/org/eclipse/swt/widgets/IME.java | 20 +- .../gtk/org/eclipse/swt/widgets/Label.java | 28 +- .../gtk/org/eclipse/swt/widgets/Link.java | 28 +- .../gtk/org/eclipse/swt/widgets/List.java | 200 +- .../gtk/org/eclipse/swt/widgets/Menu.java | 66 +- .../gtk/org/eclipse/swt/widgets/MenuItem.java | 40 +- .../gtk/org/eclipse/swt/widgets/MessageBox.java | 10 +- .../gtk/org/eclipse/swt/widgets/ProgressBar.java | 12 +- .../gtk/org/eclipse/swt/widgets/Sash.java | 40 +- .../gtk/org/eclipse/swt/widgets/Scale.java | 16 +- .../gtk/org/eclipse/swt/widgets/ScrollBar.java | 26 +- .../gtk/org/eclipse/swt/widgets/Scrollable.java | 26 +- .../gtk/org/eclipse/swt/widgets/Shell.java | 178 +- .../gtk/org/eclipse/swt/widgets/Slider.java | 36 +- .../gtk/org/eclipse/swt/widgets/Spinner.java | 128 +- .../gtk/org/eclipse/swt/widgets/TabFolder.java | 46 +- .../gtk/org/eclipse/swt/widgets/TabItem.java | 24 +- .../gtk/org/eclipse/swt/widgets/Table.java | 410 +- .../gtk/org/eclipse/swt/widgets/TableColumn.java | 38 +- .../gtk/org/eclipse/swt/widgets/TableItem.java | 94 +- .../gtk/org/eclipse/swt/widgets/Text.java | 204 +- .../gtk/org/eclipse/swt/widgets/ToolBar.java | 40 +- .../gtk/org/eclipse/swt/widgets/ToolItem.java | 92 +- .../gtk/org/eclipse/swt/widgets/ToolTip.java | 46 +- .../gtk/org/eclipse/swt/widgets/Tracker.java | 40 +- .../gtk/org/eclipse/swt/widgets/TrayItem.java | 24 +- .../gtk/org/eclipse/swt/widgets/Tree.java | 440 +- .../gtk/org/eclipse/swt/widgets/TreeColumn.java | 38 +- .../gtk/org/eclipse/swt/widgets/TreeItem.java | 112 +- .../gtk/org/eclipse/swt/widgets/Widget.java | 330 +- .../gtk/snippets/Bug421127_Clipping_is_wrong.java | 4 +- 153 files changed, 10967 insertions(+), 13855 deletions(-) diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java index 18c0ddf914..a23412d396 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java @@ -55,9 +55,9 @@ public class SWT_AWT { static boolean loaded, swingInitialized; -static native final long /*int*/ getAWTHandle (Object canvas); +static native final long getAWTHandle (Object canvas); static native final void setDebug (Frame canvas, boolean debug); -static native final Object initFrame (long /*int*/ handle, String className); +static native final Object initFrame (long handle, String className); static native final void validateWithBounds (Frame frame, int x, int y, int w, int h); static native final void synthesizeWindowActivation (Frame frame, boolean doActivate); static native final void registerListeners (Frame frame); @@ -148,7 +148,7 @@ public static Frame new_Frame (final Composite parent) { if ((parent.getStyle () & SWT.EMBEDDED) == 0) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - long /*int*/ handle = parent.embeddedHandle; + long handle = parent.embeddedHandle; /* * Some JREs have implemented the embedded frame constructor to take an integer * and other JREs take a long. To handle this binary incompatibility, use @@ -186,9 +186,9 @@ public static Frame new_Frame (final Composite parent) { parent.getDisplay().asyncExec(() -> { if (parent.isDisposed()) return; Shell shell = parent.getShell(); - long /*int*/ awtHandle = getAWTHandle(window); + long awtHandle = getAWTHandle(window); if (awtHandle == 0) return; - long /*int*/ xWindow = GDK.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (GTK.gtk_widget_get_toplevel (shell.handle))); + long xWindow = GDK.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (GTK.gtk_widget_get_toplevel (shell.handle))); OS.XSetTransientForHint(GDK.gdk_x11_display_get_xdisplay(GDK.gdk_display_get_default()), awtHandle, xWindow); }); } @@ -262,7 +262,7 @@ public static Shell new_Shell (final Display display, final Canvas parent) { if (OS.IsWin32) SWT.error (SWT.ERROR_NOT_IMPLEMENTED); if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ handle = 0; + long handle = 0; try { loadLibrary (); handle = getAWTHandle (parent); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java index 5065b925d2..283dc2bb8b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java @@ -117,7 +117,7 @@ public class Accessible { Accessible (Control control) { super (); this.control = control; - long /*int*/ type = OS.G_OBJECT_TYPE (getControlHandle()); + long type = OS.G_OBJECT_TYPE (getControlHandle()); accessibleObject = new AccessibleObject (type, getControlHandle(), this, false); addRelations(); } @@ -479,8 +479,8 @@ public class Accessible { AccessibleObject getAccessibleObject () { if (accessibleObject == null) { - long /*int*/ widget = this.getControlHandle(); - long /*int*/ type = OS.G_OBJECT_TYPE (widget); + long widget = this.getControlHandle(); + long type = OS.G_OBJECT_TYPE (widget); if (parent == null) { accessibleObject = new AccessibleObject (type, widget, this, false); } else { @@ -491,14 +491,14 @@ public class Accessible { return accessibleObject; } - long /*int*/ getControlHandle () { - long /*int*/ result = control.handle; + long getControlHandle () { + long result = control.handle; if (control instanceof Label) { - long /*int*/ list = GTK.gtk_container_get_children (result); + long list = GTK.gtk_container_get_children (result); if (list != 0) { - long /*int*/ temp = list; + long temp = list; while (temp != 0) { - long /*int*/ widget = OS.g_list_data( temp); + long widget = OS.g_list_data( temp); if (GTK.gtk_widget_get_visible (widget)) { result = widget; break; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java index a1561eb788..1f4b047869 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java @@ -24,7 +24,7 @@ import org.eclipse.swt.internal.gtk.*; import org.eclipse.swt.widgets.*; class AccessibleObject { - long /*int*/ atkHandle; + long atkHandle; int index = -1, id = ACC.CHILDID_SELF; Accessible accessible; AccessibleObject parent; @@ -35,14 +35,14 @@ class AccessibleObject { */ boolean isLightweight = false; - static long /*int*/ actionNamePtr = -1; - static long /*int*/ descriptionPtr = -1; - static long /*int*/ keybindingPtr = -1; - static long /*int*/ namePtr = -1; + static long actionNamePtr = -1; + static long descriptionPtr = -1; + static long keybindingPtr = -1; + static long namePtr = -1; static final Map AccessibleObjects = new HashMap<> (9); static final boolean DEBUG = Device.DEBUG; - AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, boolean isLightweight) { + AccessibleObject (long type, long widget, Accessible accessible, boolean isLightweight) { super (); if (type == OS.swt_fixed_get_type()) { if (widget != 0 && !isLightweight) { @@ -81,8 +81,8 @@ class AccessibleObject { * @return an AtkActionIface Java object representing the interface struct of atkObject's * parent */ - static AtkActionIface getParentActionIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + static AtkActionIface getParentActionIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type(); if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_ACTION())) { AtkActionIface iface = new AtkActionIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (atkObject))); @@ -105,7 +105,7 @@ class AccessibleObject { * @return long int representing whether the action succeeded: 1 for success, * 0 for failure */ - static long /*int*/ atkAction_do_action (long /*int*/ atkObject, long /*int*/ index) { + static long atkAction_do_action (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -121,7 +121,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkActionIface iface = getParentActionIface (atkObject); if (iface != null && iface.do_action != 0) { parentResult = ATK.call (iface.do_action, atkObject, index); @@ -143,7 +143,7 @@ class AccessibleObject { * * @return the number of actions available */ - static long /*int*/ atkAction_get_n_actions (long /*int*/ atkObject) { + static long atkAction_get_n_actions (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -158,7 +158,7 @@ class AccessibleObject { return event.count; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkActionIface iface = getParentActionIface (atkObject); if (iface != null && iface.get_n_actions != 0) { parentResult = ATK.call (iface.get_n_actions, atkObject); @@ -179,7 +179,7 @@ class AccessibleObject { * * @return a pointer to the description string */ - static long /*int*/ atkAction_get_description (long /*int*/ atkObject, long /*int*/ index) { + static long atkAction_get_description (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -197,7 +197,7 @@ class AccessibleObject { return descriptionPtr = getStringPtr (event.result); } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkActionIface iface = getParentActionIface (atkObject); if (iface != null && iface.get_description != 0) { parentResult = ATK.call (iface.get_description, atkObject, index); @@ -219,9 +219,9 @@ class AccessibleObject { * * @return a pointer to the keybinding string */ - static long /*int*/ atkAction_get_keybinding (long /*int*/ atkObject, long /*int*/ index) { + static long atkAction_get_keybinding (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkActionIface iface = getParentActionIface (atkObject); if (iface != null && iface.get_keybinding != 0) { parentResult = ATK.call (iface.get_keybinding, atkObject, index); @@ -274,9 +274,9 @@ class AccessibleObject { * * @return a pointer to the name string */ - static long /*int*/ atkAction_get_name (long /*int*/ atkObject, long /*int*/ index) { + static long atkAction_get_name (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkActionIface iface = getParentActionIface (atkObject); if (iface != null && iface.get_name != 0) { parentResult = ATK.call (iface.get_name, atkObject, index); @@ -328,8 +328,8 @@ class AccessibleObject { * @return an AtkComponentIface Java object representing the interface struct of atkObject's * parent */ - static AtkComponentIface getParentComponentIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + static AtkComponentIface getParentComponentIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type(); if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_COMPONENT())) { AtkComponentIface iface = new AtkComponentIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (atkObject))); @@ -356,8 +356,8 @@ class AccessibleObject { * * @return 0 (this is a void function at the native level) */ - static long /*int*/ atkComponent_get_extents (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, - long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) { + static long atkComponent_get_extents (long atkObject, long x, long y, + long width, long height, long coord_type) { AccessibleObject object = getAccessibleObject (atkObject); C.memmove (x, new int[] {0}, 4); C.memmove (y, new int[] {0}, 4); @@ -422,8 +422,8 @@ class AccessibleObject { * * @return a pointer to the accessible child, if one exists */ - static long /*int*/ atkComponent_ref_accessible_at_point (long /*int*/ atkObject, long /*int*/ x, - long /*int*/ y, long /*int*/ coord_type) { + static long atkComponent_ref_accessible_at_point (long atkObject, long x, + long y, long coord_type) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -451,7 +451,7 @@ class AccessibleObject { } } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkComponentIface iface = getParentComponentIface (atkObject); if (iface != null && iface.ref_accessible_at_point != 0) { parentResult = OS.call (iface.ref_accessible_at_point, atkObject, x, y, coord_type); @@ -470,8 +470,8 @@ class AccessibleObject { * @return an AtkEdtiableTextIface Java object representing the interface struct of atkObject's * parent */ - static AtkEditableTextIface getParentEditableTextIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + static AtkEditableTextIface getParentEditableTextIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type(); if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_EDITABLE_TEXT())) { AtkEditableTextIface iface = new AtkEditableTextIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_EDITABLE_TEXT_GET_IFACE (atkObject))); @@ -495,8 +495,8 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkEditableText_set_run_attributes (long /*int*/ atkObject, long /*int*/ attrib_set, - long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkEditableText_set_run_attributes (long atkObject, long attrib_set, + long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -504,14 +504,14 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { Display display = accessible.control.getDisplay(); - long /*int*/ fontDesc = OS.pango_font_description_new (); + long fontDesc = OS.pango_font_description_new (); boolean createFont = false; TextStyle style = new TextStyle(); String [] attributes = new String [0]; - long /*int*/ current = attrib_set; + long current = attrib_set; int listLength = OS.g_slist_length (attrib_set); for (int i = 0; i < listLength; i++) { - long /*int*/ attrPtr = OS.g_slist_data (current); + long attrPtr = OS.g_slist_data (current); if (attrPtr != 0) { AtkAttribute attr = new AtkAttribute(); ATK.memmove(attr, attrPtr, AtkAttribute.sizeof); @@ -633,7 +633,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkEditableTextIface iface = getParentEditableTextIface (atkObject); if (iface != null && iface.set_run_attributes != 0) { parentResult = OS.call (iface.set_run_attributes, atkObject, attrib_set, start_offset, end_offset); @@ -671,7 +671,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkEditableText_set_text_contents (long /*int*/ atkObject, long /*int*/ string) { + static long atkEditableText_set_text_contents (long atkObject, long string) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -690,7 +690,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkEditableTextIface iface = getParentEditableTextIface (atkObject); if (iface != null && iface.set_text_contents != 0) { parentResult = ATK.call (iface.set_text_contents, atkObject, string); @@ -715,8 +715,8 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkEditableText_insert_text (long /*int*/ atkObject, long /*int*/ string, - long /*int*/ string_length, long /*int*/ position) { + static long atkEditableText_insert_text (long atkObject, long string, + long string_length, long position) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -735,7 +735,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkEditableTextIface iface = getParentEditableTextIface (atkObject); if (iface != null && iface.insert_text != 0) { parentResult = OS.call (iface.insert_text, atkObject, string, string_length, position); @@ -758,7 +758,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkEditableText_copy_text(long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { + static long atkEditableText_copy_text(long atkObject, long start_pos, long end_pos) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -775,7 +775,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkEditableTextIface iface = getParentEditableTextIface (atkObject); if (iface != null && iface.copy_text != 0) { parentResult = ATK.call (iface.copy_text, atkObject, start_pos, end_pos); @@ -798,7 +798,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkEditableText_cut_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { + static long atkEditableText_cut_text (long atkObject, long start_pos, long end_pos) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -815,7 +815,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkEditableTextIface iface = getParentEditableTextIface (atkObject); if (iface != null && iface.cut_text != 0) { parentResult = ATK.call (iface.cut_text, atkObject, start_pos, end_pos); @@ -837,7 +837,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkEditableText_delete_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { + static long atkEditableText_delete_text (long atkObject, long start_pos, long end_pos) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -855,7 +855,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkEditableTextIface iface = getParentEditableTextIface (atkObject); if (iface != null && iface.delete_text != 0) { parentResult = ATK.call (iface.delete_text, atkObject, start_pos, end_pos); @@ -876,7 +876,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkEditableText_paste_text (long /*int*/ atkObject, long /*int*/ position) { + static long atkEditableText_paste_text (long atkObject, long position) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -892,7 +892,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkEditableTextIface iface = getParentEditableTextIface (atkObject); if (iface != null && iface.paste_text != 0) { parentResult = ATK.call (iface.paste_text, atkObject, position); @@ -910,8 +910,8 @@ class AccessibleObject { * @return an AtkHypertextIface Java object representing the interface struct of atkObject's * parent */ - static AtkHypertextIface getParentHypertextIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + static AtkHypertextIface getParentHypertextIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type(); if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_HYPERTEXT())) { AtkHypertextIface iface = new AtkHypertextIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_HYPERTEXT_GET_IFACE (atkObject))); @@ -933,7 +933,7 @@ class AccessibleObject { * * @return a pointer to the AtkHypertext at link_index in atkObject */ - static long /*int*/ atkHypertext_get_link (long /*int*/ atkObject, long /*int*/ link_index) { + static long atkHypertext_get_link (long atkObject, long link_index) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -950,7 +950,7 @@ class AccessibleObject { return result != null ? result.getAccessibleObject().atkHandle : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkHypertextIface iface = getParentHypertextIface (atkObject); if (iface != null && iface.get_link != 0) { parentResult = ATK.call (iface.get_link, atkObject, link_index); @@ -971,7 +971,7 @@ class AccessibleObject { * @return an integer representing the number of links in the hypertext * in atkObject */ - static long /*int*/ atkHypertext_get_n_links (long /*int*/ atkObject) { + static long atkHypertext_get_n_links (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -986,7 +986,7 @@ class AccessibleObject { return event.count; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkHypertextIface iface = getParentHypertextIface (atkObject); if (iface != null && iface.get_n_links != 0) { parentResult = ATK.call (iface.get_n_links, atkObject); @@ -1009,7 +1009,7 @@ class AccessibleObject { * @return an integer representing the index into the array of * hypertexts */ - static long /*int*/ atkHypertext_get_link_index (long /*int*/ atkObject, long /*int*/ char_index) { + static long atkHypertext_get_link_index (long atkObject, long char_index) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -1026,7 +1026,7 @@ class AccessibleObject { return event.index; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkHypertextIface iface = getParentHypertextIface (atkObject); if (iface != null && iface.get_link_index != 0) { parentResult = ATK.call (iface.get_link_index, atkObject, char_index); @@ -1046,9 +1046,9 @@ class AccessibleObject { */ static AtkObjectClass getParentAtkObjectClass () { AtkObjectClass objectClass = new AtkObjectClass (); - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + long type = OS.swt_fixed_accessible_get_type(); if (type != 0) { - long /*int*/ parentType = OS.g_type_parent (type); + long parentType = OS.g_type_parent (type); if (parentType != 0) ATK.memmove (objectClass, OS.g_type_class_peek (parentType)); } return objectClass; @@ -1067,9 +1067,9 @@ class AccessibleObject { * * @return a pointer to the gchar representation of the accessible description */ - static long /*int*/ atkObject_get_description (long /*int*/ atkObject) { + static long atkObject_get_description (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkObjectClass objectClass = getParentAtkObjectClass (); if (objectClass.get_description != 0) { parentResult = ATK.call (objectClass.get_description, atkObject); @@ -1108,9 +1108,9 @@ class AccessibleObject { * @return a pointer to the AtkAttributeSet consisting of all properties * applied to atkObject (can be empty if no properties are set) */ - static long /*int*/ atkObject_get_attributes (long /*int*/ atkObject) { + static long atkObject_get_attributes (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkObjectClass objectClass = getParentAtkObjectClass (); if (objectClass.get_attributes != 0) { parentResult = ATK.call (objectClass.get_attributes, atkObject); @@ -1129,48 +1129,48 @@ class AccessibleObject { } AtkAttribute attr = new AtkAttribute(); if (event.leftMargin != -1) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_LEFT_MARGIN)); attr.value = getStringPtr (String.valueOf(event.leftMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.rightMargin != -1) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RIGHT_MARGIN)); attr.value = getStringPtr (String.valueOf(event.rightMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.topMargin != -1) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr ("top-margin"); //$NON-NLS-1$ attr.value = getStringPtr (String.valueOf(event.topMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.bottomMargin != -1) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr ("bottom-margin"); //$NON-NLS-1$ attr.value = getStringPtr (String.valueOf(event.bottomMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.indent != -1) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_INDENT)); attr.value = getStringPtr (String.valueOf(event.indent)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.justify) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION)); attr.value = getStringPtr ("fill"); //$NON-NLS-1$ ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } else if (event.alignment != -1) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION)); String str = "left"; //$NON-NLS-1$ switch (event.alignment) { @@ -1205,21 +1205,21 @@ class AccessibleObject { } } if (level != 0) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr ("level"); //$NON-NLS-1$ attr.value = getStringPtr (String.valueOf(level)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (setsize != 0) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr ("setsize"); //$NON-NLS-1$ attr.value = getStringPtr (String.valueOf(setsize)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (posinset != 0) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr ("posinset"); //$NON-NLS-1$ attr.value = getStringPtr (String.valueOf(posinset)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -1229,7 +1229,7 @@ class AccessibleObject { if (event.attributes != null) { int end = event.attributes.length / 2 * 2; for (int i = 0; i < end; i+= 2) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr (event.attributes[i]); attr.value = getStringPtr (event.attributes[i + 1]); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -1254,9 +1254,9 @@ class AccessibleObject { * * @return a pointer to the gchar representation of the accessible name */ - static long /*int*/ atkObject_get_name (long /*int*/ atkObject) { + static long atkObject_get_name (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkObjectClass objectClass = getParentAtkObjectClass (); if (objectClass.get_name != 0) { parentResult = ATK.call (objectClass.get_name, atkObject); @@ -1295,9 +1295,9 @@ class AccessibleObject { * @return an int representing the number of accessible children associated * with atkObject */ - static long /*int*/ atkObject_get_n_children (long /*int*/ atkObject) { + static long atkObject_get_n_children (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkObjectClass objectClass = getParentAtkObjectClass (); if (objectClass.get_n_children != 0) { parentResult = ATK.call (objectClass.get_n_children, atkObject); @@ -1334,7 +1334,7 @@ class AccessibleObject { * @return an int which is the index of the accessible atkObject in its * parent */ - static long /*int*/ atkObject_get_index_in_parent (long /*int*/ atkObject) { + static long atkObject_get_index_in_parent (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -1355,7 +1355,7 @@ class AccessibleObject { } AtkObjectClass objectClass = getParentAtkObjectClass (); if (objectClass.get_index_in_parent == 0) return 0; - long /*int*/ result = ATK.call (objectClass.get_index_in_parent, atkObject); + long result = ATK.call (objectClass.get_index_in_parent, atkObject); return result; } @@ -1373,7 +1373,7 @@ class AccessibleObject { * @return a pointer to the AtkObject representing the accessible parent of * atkObject */ - static long /*int*/ atkObject_get_parent (long /*int*/ atkObject) { + static long atkObject_get_parent (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { if (object.parent != null) { @@ -1382,7 +1382,7 @@ class AccessibleObject { } AtkObjectClass objectClass = getParentAtkObjectClass (); if (objectClass.get_parent == 0) return 0; - long /*int*/ parentResult = ATK.call (objectClass.get_parent, atkObject); + long parentResult = ATK.call (objectClass.get_parent, atkObject); return parentResult; } @@ -1398,7 +1398,7 @@ class AccessibleObject { * * @return the AtkRole of atkObject */ - static long /*int*/ atkObject_get_role (long /*int*/ atkObject) { + static long atkObject_get_role (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -1489,7 +1489,7 @@ class AccessibleObject { * * @return a pointer to the AtkObject of the child at the provided index */ - static long /*int*/ atkObject_ref_child (long /*int*/ atkObject, long /*int*/ index) { + static long atkObject_ref_child (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null && object.id == ACC.CHILDID_SELF) { Accessible accessible = object.accessible; @@ -1534,9 +1534,9 @@ class AccessibleObject { * * @return a pointer to the AtkStateSet for the accessible widget atkObject */ - static long /*int*/ atkObject_ref_state_set (long /*int*/ atkObject) { + static long atkObject_ref_state_set (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkObjectClass objectClass = getParentAtkObjectClass (); if (objectClass.ref_state_set != 0) { parentResult = ATK.call (objectClass.ref_state_set, atkObject); @@ -1546,7 +1546,7 @@ class AccessibleObject { List listeners = accessible.accessibleControlListeners; int length = size(listeners); if (length > 0) { - long /*int*/ set = parentResult; + long set = parentResult; AccessibleControlEvent event = new AccessibleControlEvent (accessible); event.childID = object.id; event.detail = -1; @@ -1596,8 +1596,8 @@ class AccessibleObject { * @return an AtkSelectionIface Java object representing the interface struct of atkObject's * parent */ - static AtkSelectionIface getParentSelectionIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type() ; + static AtkSelectionIface getParentSelectionIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type() ; if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_SELECTION())) { AtkSelectionIface iface = new AtkSelectionIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (atkObject))); @@ -1619,9 +1619,9 @@ class AccessibleObject { * * @return a long integer where 1 represents TRUE, 0 otherwise */ - static long /*int*/ atkSelection_is_child_selected (long /*int*/ atkObject, long /*int*/ index) { + static long atkSelection_is_child_selected (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkSelectionIface iface = getParentSelectionIface (atkObject); if (iface != null && iface.is_child_selected != 0) { parentResult = ATK.call (iface.is_child_selected, atkObject, index); @@ -1662,9 +1662,9 @@ class AccessibleObject { * @return a pointer to the AtkObject representing the selected accessible, * or 0 */ - static long /*int*/ atkSelection_ref_selection (long /*int*/ atkObject, long /*int*/ index) { + static long atkSelection_ref_selection (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkSelectionIface iface = getParentSelectionIface (atkObject); if (iface != null && iface.ref_selection != 0) { parentResult = ATK.call (iface.ref_selection, atkObject, index); @@ -1701,8 +1701,8 @@ class AccessibleObject { * @return an AtkTableIface Java object representing the interface struct of atkObject's * parent */ - static AtkTableIface getParentTableIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + static AtkTableIface getParentTableIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type(); if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_TABLE())) { AtkTableIface iface = new AtkTableIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_TABLE_GET_IFACE (atkObject))); @@ -1725,7 +1725,7 @@ class AccessibleObject { * * @return a pointer to an AtkObject representing the specified table */ - static long /*int*/ atkTable_ref_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + static long atkTable_ref_at (long atkObject, long row, long column) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -1747,7 +1747,7 @@ class AccessibleObject { } } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.ref_at != 0) { parentResult = ATK.call (iface.ref_at, atkObject, row, column); @@ -1769,7 +1769,7 @@ class AccessibleObject { * * @return a pointer to an AtkObject representing the specified table */ - static long /*int*/ atkTable_get_index_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + static long atkTable_get_index_at (long atkObject, long row, long column) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -1793,7 +1793,7 @@ class AccessibleObject { return row * event.count + column; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_index_at != 0) { parentResult = ATK.call (iface.get_index_at, atkObject, row, column); @@ -1815,7 +1815,7 @@ class AccessibleObject { * @return a long integer representing the column at the specified index, or * -1 */ - static long /*int*/ atkTable_get_column_at_index (long /*int*/ atkObject, long /*int*/ index) { + static long atkTable_get_column_at_index (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -1827,11 +1827,11 @@ class AccessibleObject { AccessibleTableListener listener = listeners.get(i); listener.getColumnCount(event); } - long /*int*/ result = event.count == 0 ? -1 : index % event.count; + long result = event.count == 0 ? -1 : index % event.count; return result; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_column_at_index != 0) { parentResult = ATK.call (iface.get_column_at_index, atkObject, index); @@ -1853,7 +1853,7 @@ class AccessibleObject { * @return a long integer representing the row at the specified index, or * -1 */ - static long /*int*/ atkTable_get_row_at_index (long /*int*/ atkObject, long /*int*/ index) { + static long atkTable_get_row_at_index (long atkObject, long index) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -1865,11 +1865,11 @@ class AccessibleObject { AccessibleTableListener listener = listeners.get(i); listener.getColumnCount(event); } - long /*int*/ result = event.count == 0 ? -1 : index / event.count; + long result = event.count == 0 ? -1 : index / event.count; return result; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_row_at_index != 0) { parentResult = ATK.call (iface.get_row_at_index, atkObject, index); @@ -1890,9 +1890,9 @@ class AccessibleObject { * @return a long integer representing the number of columns, or * 0 */ - static long /*int*/ atkTable_get_n_columns (long /*int*/ atkObject) { + static long atkTable_get_n_columns (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_n_columns != 0) { parentResult = ATK.call (iface.get_n_columns, atkObject); @@ -1927,9 +1927,9 @@ class AccessibleObject { * @return a long integer representing the number of rows, or * 0 */ - static long /*int*/ atkTable_get_n_rows (long /*int*/ atkObject) { + static long atkTable_get_n_rows (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_n_rows != 0) { parentResult = ATK.call (iface.get_n_rows, atkObject); @@ -1967,9 +1967,9 @@ class AccessibleObject { * @return a long integer representing the column extent at the * specified position, or 0 */ - static long /*int*/ atkTable_get_column_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + static long atkTable_get_column_extent_at (long atkObject, long row, long column) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_column_extent_at != 0) { parentResult = ATK.call (iface.get_column_extent_at, atkObject, row, column); @@ -2021,9 +2021,9 @@ class AccessibleObject { * @return a long integer representing the row extent at the specified * position, or 0 */ - static long /*int*/ atkTable_get_row_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + static long atkTable_get_row_extent_at (long atkObject, long row, long column) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_row_extent_at != 0) { parentResult = ATK.call (iface.get_row_extent_at, atkObject, row, column); @@ -2071,7 +2071,7 @@ class AccessibleObject { * * @return a pointer to the AtkObject representing the caption, or 0 */ - static long /*int*/ atkTable_get_caption (long /*int*/ atkObject) { + static long atkTable_get_caption (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2087,7 +2087,7 @@ class AccessibleObject { if (result != null) return result.getAccessibleObject().atkHandle; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_caption != 0) { parentResult = ATK.call (iface.get_caption, atkObject); @@ -2107,7 +2107,7 @@ class AccessibleObject { * * @return a pointer to the AtkObject representing the summary, or 0 */ - static long /*int*/ atkTable_get_summary (long /*int*/ atkObject) { + static long atkTable_get_summary (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2123,7 +2123,7 @@ class AccessibleObject { if (result != null) return result.getAccessibleObject().atkHandle; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_summary != 0) { parentResult = ATK.call (iface.get_summary, atkObject); @@ -2145,9 +2145,9 @@ class AccessibleObject { * @return a pointer to the gchar representation of the column description, * or 0 */ - static long /*int*/ atkTable_get_column_description (long /*int*/ atkObject, long /*int*/ column) { + static long atkTable_get_column_description (long atkObject, long column) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_column_description != 0) { parentResult = ATK.call (iface.get_column_description, atkObject, column); @@ -2186,7 +2186,7 @@ class AccessibleObject { * @return a pointer to the AtkObject representing the specified column * header, or 0 */ - static long /*int*/ atkTable_get_column_header (long /*int*/ atkObject, long /*int*/ column) { + static long atkTable_get_column_header (long atkObject, long column) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2206,7 +2206,7 @@ class AccessibleObject { } } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_column_header != 0) { parentResult = ATK.call (iface.get_column_header, atkObject, column); @@ -2228,9 +2228,9 @@ class AccessibleObject { * @return a pointer to the gchar representation of the row description, * or 0 */ - static long /*int*/ atkTable_get_row_description (long /*int*/ atkObject, long /*int*/ row) { + static long atkTable_get_row_description (long atkObject, long row) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_row_description != 0) { parentResult = ATK.call (iface.get_row_description, atkObject, row); @@ -2269,7 +2269,7 @@ class AccessibleObject { * @return a pointer to the AtkObject representing the specified row * header, or 0 */ - static long /*int*/ atkTable_get_row_header (long /*int*/ atkObject, long /*int*/ row) { + static long atkTable_get_row_header (long atkObject, long row) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2289,7 +2289,7 @@ class AccessibleObject { } } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_row_header != 0) { parentResult = ATK.call (iface.get_row_header, atkObject, row); @@ -2312,7 +2312,7 @@ class AccessibleObject { * @return a long integer representing the number of columns selected, * or 0 */ - static long /*int*/ atkTable_get_selected_columns (long /*int*/ atkObject, long /*int*/ selected) { + static long atkTable_get_selected_columns (long atkObject, long selected) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2325,13 +2325,13 @@ class AccessibleObject { listener.getSelectedColumns(event); } int count = event.selected != null ? event.selected.length : 0; - long /*int*/ result = OS.g_malloc(count * 4); + long result = OS.g_malloc(count * 4); if (event.selected != null) C.memmove(result, event.selected, count * 4); if (selected != 0) C.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF); return count; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_selected_columns != 0) { parentResult = ATK.call (iface.get_selected_columns, atkObject, selected); @@ -2354,7 +2354,7 @@ class AccessibleObject { * @return a long integer representing the number of rows selected, * or 0 */ - static long /*int*/ atkTable_get_selected_rows (long /*int*/ atkObject, long /*int*/ selected) { + static long atkTable_get_selected_rows (long atkObject, long selected) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2367,13 +2367,13 @@ class AccessibleObject { listener.getSelectedRows(event); } int count = event.selected != null ? event.selected.length : 0; - long /*int*/ result = OS.g_malloc(count * 4); + long result = OS.g_malloc(count * 4); if (event.selected != null) C.memmove(result, event.selected, count * 4); if (selected != 0) C.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF); return count; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.get_selected_rows != 0) { parentResult = ATK.call (iface.get_selected_rows, atkObject, selected); @@ -2394,9 +2394,9 @@ class AccessibleObject { * * @return a long integer where 1 represents TRUE, 0 otherwise */ - static long /*int*/ atkTable_is_column_selected (long /*int*/ atkObject, long /*int*/ column) { + static long atkTable_is_column_selected (long atkObject, long column) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.is_column_selected != 0) { parentResult = ATK.call (iface.is_column_selected, atkObject, column); @@ -2432,9 +2432,9 @@ class AccessibleObject { * * @return a long integer where 1 represents TRUE, 0 otherwise */ - static long /*int*/ atkTable_is_row_selected (long /*int*/ atkObject, long /*int*/ row) { + static long atkTable_is_row_selected (long atkObject, long row) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.is_row_selected != 0) { parentResult = ATK.call (iface.is_row_selected, atkObject, row); @@ -2472,9 +2472,9 @@ class AccessibleObject { * * @return a long integer where 1 represents TRUE, 0 otherwise */ - static long /*int*/ atkTable_is_selected (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + static long atkTable_is_selected (long atkObject, long row, long column) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.is_selected != 0) { parentResult = ATK.call (iface.is_selected, atkObject, row, column); @@ -2524,7 +2524,7 @@ class AccessibleObject { * @return a long int representing whether the action succeeded: 1 for success, * 0 for failure */ - static long /*int*/ atkTable_add_row_selection (long /*int*/ atkObject, long /*int*/ row) { + static long atkTable_add_row_selection (long atkObject, long row) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2540,7 +2540,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.add_row_selection != 0) { parentResult = ATK.call (iface.add_row_selection, atkObject, row); @@ -2562,7 +2562,7 @@ class AccessibleObject { * @return a long int representing whether the action succeeded: 1 for success, * 0 for failure */ - static long /*int*/ atkTable_remove_row_selection (long /*int*/ atkObject, long /*int*/ row) { + static long atkTable_remove_row_selection (long atkObject, long row) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2578,7 +2578,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.remove_row_selection != 0) { parentResult = ATK.call (iface.remove_row_selection, atkObject, row); @@ -2600,7 +2600,7 @@ class AccessibleObject { * @return a long int representing whether the action succeeded: 1 for success, * 0 for failure */ - static long /*int*/ atkTable_add_column_selection (long /*int*/ atkObject, long /*int*/ column) { + static long atkTable_add_column_selection (long atkObject, long column) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2616,7 +2616,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.add_column_selection != 0) { parentResult = ATK.call (iface.add_column_selection, atkObject, column); @@ -2638,7 +2638,7 @@ class AccessibleObject { * @return a long int representing whether the action succeeded: 1 for success, * 0 for failure */ - static long /*int*/ atkTable_remove_column_selection (long /*int*/ atkObject, long /*int*/ column) { + static long atkTable_remove_column_selection (long atkObject, long column) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2654,7 +2654,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTableIface iface = getParentTableIface (atkObject); if (iface != null && iface.remove_column_selection != 0) { parentResult = ATK.call (iface.remove_column_selection, atkObject, column); @@ -2672,8 +2672,8 @@ class AccessibleObject { * @return an AtkTextIface Java object representing the interface struct of atkObject's * parent */ - static AtkTextIface getParentTextIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + static AtkTextIface getParentTextIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type(); if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_TEXT())) { AtkTextIface iface = new AtkTextIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (atkObject))); @@ -2682,16 +2682,16 @@ class AccessibleObject { return null; } - static String getString (long /*int*/ strPtr) { + static String getString (long strPtr) { int length = C.strlen (strPtr); byte [] buffer = new byte [length]; C.memmove (buffer, strPtr, length); return new String (Converter.mbcsToWcs (buffer)); } - static long /*int*/ getStringPtr (String str) { + static long getStringPtr (String str) { byte [] buffer = Converter.wcsToMbcs(str != null ? str : "", true); - long /*int*/ ptr = OS.g_malloc(buffer.length); + long ptr = OS.g_malloc(buffer.length); C.memmove(ptr, buffer, buffer.length); return ptr; } @@ -2717,8 +2717,8 @@ class AccessibleObject { * @return a long int representation of 0 indicating that the method completed * successfully */ - static long /*int*/ atkText_get_character_extents (long /*int*/ atkObject, long /*int*/ offset, - long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, long /*int*/ coords) { + static long atkText_get_character_extents (long atkObject, long offset, + long x, long y, long width, long height, long coords) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2771,8 +2771,8 @@ class AccessibleObject { * @return a long int representation of 0 indicating that the method completed * successfully */ - static long /*int*/ atkText_get_range_extents (long /*int*/ atkObject, long /*int*/ start_offset, - long /*int*/ end_offset, long /*int*/ coord_type, long /*int*/ rect) { + static long atkText_get_range_extents (long atkObject, long start_offset, + long end_offset, long coord_type, long rect) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2824,8 +2824,8 @@ class AccessibleObject { * * @return a pointer to the AtkAttributeSet created */ - static long /*int*/ atkText_get_run_attributes (long /*int*/ atkObject, long /*int*/ offset, - long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_get_run_attributes (long atkObject, long offset, + long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2841,18 +2841,18 @@ class AccessibleObject { C.memmove (start_offset, new int []{event.start}, 4); C.memmove (end_offset, new int []{event.end}, 4); TextStyle style = event.textStyle; - long /*int*/ result = 0; + long result = 0; AtkAttribute attr = new AtkAttribute(); if (style != null) { if (style.rise != 0) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RISE)); attr.value = getStringPtr (String.valueOf(style.rise)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); result = OS.g_slist_append(result, attrPtr); } if (style.underline) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_UNDERLINE)); String str = "none"; //$NON-NLS-1$ switch (style.underlineStyle) { @@ -2866,7 +2866,7 @@ class AccessibleObject { result = OS.g_slist_append(result, attrPtr); } if (style.strikeout) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STRIKETHROUGH)); attr.value = getStringPtr ("1"); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2875,7 +2875,7 @@ class AccessibleObject { Font font = style.font; if (font != null && !font.isDisposed()) { //TODO language and direction - long /*int*/ attrPtr; + long attrPtr; attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME)); attr.value = OS.g_strdup (OS.pango_font_description_get_family (font.handle)); @@ -2914,7 +2914,7 @@ class AccessibleObject { } Color color = style.foreground; if (color != null && !color.isDisposed()) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR)); attr.value = getStringPtr ((color.handle.red * 255) + "," + (color.handle.green * 255) + "," + (color.handle.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$ ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2922,7 +2922,7 @@ class AccessibleObject { } color = style.background; if (color != null && !color.isDisposed()) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR)); attr.value = getStringPtr ((color.handle.red * 255) + "," + (color.handle.green * 255) + "," + (color.handle.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$ ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2932,7 +2932,7 @@ class AccessibleObject { if (event.attributes != null) { int end = event.attributes.length / 2 * 2; for (int i = 0; i < end; i+= 2) { - long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr (event.attributes[i]); attr.value = getStringPtr (event.attributes[i + 1]); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2942,7 +2942,7 @@ class AccessibleObject { return result; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.get_run_attributes != 0) { parentResult = OS.call (iface.get_run_attributes, atkObject, offset, start_offset, end_offset); @@ -2966,8 +2966,8 @@ class AccessibleObject { * @return the offset to the character which is located at the specified * x and y coordinates */ - static long /*int*/ atkText_get_offset_at_point (long /*int*/ atkObject, long /*int*/ x, - long /*int*/ y, long /*int*/ coords) { + static long atkText_get_offset_at_point (long atkObject, long x, + long y, long coords) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -2990,7 +2990,7 @@ class AccessibleObject { return event.offset; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.get_offset_at_point != 0) { parentResult = OS.call (iface.get_offset_at_point, atkObject, x, y, coords); @@ -3012,7 +3012,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkText_add_selection (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_add_selection (long atkObject, long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3029,7 +3029,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.add_selection != 0) { parentResult = ATK.call (iface.add_selection, atkObject, start_offset, end_offset); @@ -3050,7 +3050,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkText_remove_selection (long /*int*/ atkObject, long /*int*/ selection_num) { + static long atkText_remove_selection (long atkObject, long selection_num) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3066,7 +3066,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.remove_selection != 0) { parentResult = ATK.call (iface.remove_selection, atkObject, selection_num); @@ -3087,7 +3087,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkText_set_caret_offset (long /*int*/ atkObject, long /*int*/ offset) { + static long atkText_set_caret_offset (long atkObject, long offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3125,8 +3125,8 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkText_set_selection (long /*int*/ atkObject, long /*int*/ selection_num, - long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_set_selection (long atkObject, long selection_num, + long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3144,7 +3144,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.set_selection != 0) { parentResult = OS.call (iface.set_selection, atkObject, selection_num, start_offset, end_offset); @@ -3164,9 +3164,9 @@ class AccessibleObject { * * @return a long int representation of the offset position of the caret (cursor) */ - static long /*int*/ atkText_get_caret_offset (long /*int*/ atkObject) { + static long atkText_get_caret_offset (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.get_caret_offset != 0) { parentResult = ATK.call (iface.get_caret_offset, atkObject); @@ -3217,8 +3217,8 @@ class AccessibleObject { * * @return a pointer to the array of AtkTextRanges */ - static long /*int*/ atkText_get_bounded_ranges (long /*int*/ atkObject, long /*int*/ rect, - long /*int*/ coord_type, long /*int*/ x_clip_type, long /*int*/ y_clip_type) { + static long atkText_get_bounded_ranges (long atkObject, long rect, + long coord_type, long x_clip_type, long y_clip_type) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3238,7 +3238,7 @@ class AccessibleObject { } int [] ranges = event.ranges; int size = ranges == null ? 1 : ranges.length / 2; - long /*int*/ result = C.malloc(size * AtkTextRange.sizeof); + long result = C.malloc(size * AtkTextRange.sizeof); AtkTextRange range = new AtkTextRange(); for (int j = 0, end = (ranges != null ? ranges.length / 2 : 1); j < end; j++) { if (ranges != null) { @@ -3270,7 +3270,7 @@ class AccessibleObject { return result; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.get_bounded_ranges != 0) { parentResult = ATK.call (iface.get_bounded_ranges, atkObject); @@ -3291,7 +3291,7 @@ class AccessibleObject { * * @return a long int representing the character at offset */ - static long /*int*/ atkText_get_character_at_offset (long /*int*/ atkObject, long /*int*/ offset) { + static long atkText_get_character_at_offset (long atkObject, long offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3331,7 +3331,7 @@ class AccessibleObject { * * @return the number of characters */ - static long /*int*/ atkText_get_character_count (long /*int*/ atkObject) { + static long atkText_get_character_count (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3367,7 +3367,7 @@ class AccessibleObject { * * @return the number of selected regions, or -1 if a failure occurred */ - static long /*int*/ atkText_get_n_selections (long /*int*/ atkObject) { + static long atkText_get_n_selections (long atkObject) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3393,7 +3393,7 @@ class AccessibleObject { if (event.length > 0) return 1; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.get_n_selections != 0) { parentResult = ATK.call (iface.get_n_selections, atkObject); @@ -3416,10 +3416,10 @@ class AccessibleObject { * * @return a pointer to the newly allocated string containing the selected text */ - static long /*int*/ atkText_get_selection (long /*int*/ atkObject, long /*int*/ selection_num, - long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_get_selection (long atkObject, long selection_num, + long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); - long /*int*/ parentResult = 0; + long parentResult = 0; C.memmove (start_offset, new int[] {0}, 4); C.memmove (end_offset, new int[] {0}, 4); AtkTextIface iface = getParentTextIface (atkObject); @@ -3500,7 +3500,7 @@ class AccessibleObject { * @return a pointer to the newly allocated string containing the text * from start_offset up to (but not including) end_offset */ - static long /*int*/ atkText_get_text (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_get_text (long atkObject, long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -3553,15 +3553,15 @@ class AccessibleObject { * @return a pointer to the newly allocated string containing * the text after offset bounded by the specified boundary_type */ - static long /*int*/ atkText_get_text_after_offset (long /*int*/ atkObject, long /*int*/ offset_value, - long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_get_text_after_offset (long atkObject, long offset_value, + long boundary_type, long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; List listeners = accessible.accessibleTextExtendedListeners; int length = size(listeners); if (length > 0) { - long /*int*/ charCount = atkText_get_character_count (atkObject); + long charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); event.start = event.end = (int)/*64*/offset_value; event.count = 1; @@ -3818,15 +3818,15 @@ class AccessibleObject { * @return a pointer to the newly allocated string containing the * text at offset bounded by the specified boundary_type */ - static long /*int*/ atkText_get_text_at_offset (long /*int*/ atkObject, long /*int*/ offset_value, - long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_get_text_at_offset (long atkObject, long offset_value, + long boundary_type, long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; List listeners = accessible.accessibleTextExtendedListeners; int length = size(listeners); if (length > 0) { - long /*int*/ charCount = atkText_get_character_count (atkObject); + long charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); event.start = event.end = (int)/*64*/offset_value; event.count = 0; @@ -4026,15 +4026,15 @@ class AccessibleObject { * @return a pointer to the newly allocated string containing * the text before offset bounded by the specified boundary_type */ - static long /*int*/ atkText_get_text_before_offset (long /*int*/ atkObject, long /*int*/ offset_value, - long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { + static long atkText_get_text_before_offset (long atkObject, long offset_value, + long boundary_type, long start_offset, long end_offset) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; List listeners = accessible.accessibleTextExtendedListeners; int length = size(listeners); if (length > 0) { - long /*int*/ charCount = atkText_get_character_count (atkObject); + long charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); event.start = event.end = (int)/*64*/offset_value; event.count = -1; @@ -4222,7 +4222,7 @@ class AccessibleObject { return 0; } - static void setGValue (long /*int*/ value, Number number) { + static void setGValue (long value, Number number) { if (number == null) return; if (OS.G_VALUE_TYPE(value) != 0) OS.g_value_unset(value); if (number instanceof Double) { @@ -4240,8 +4240,8 @@ class AccessibleObject { } } - static Number getGValue (long /*int*/ value) { - long /*int*/ type = OS.G_VALUE_TYPE(value); + static Number getGValue (long value) { + long type = OS.G_VALUE_TYPE(value); if (type == 0) return null; if (type == OS.G_TYPE_DOUBLE()) return Double.valueOf(OS.g_value_get_double(value)); if (type == OS.G_TYPE_FLOAT()) return Float.valueOf(OS.g_value_get_float(value)); @@ -4259,8 +4259,8 @@ class AccessibleObject { * @return an AtkValueIface Java object representing the interface struct of atkObject's * parent */ - static AtkValueIface getParentValueIface (long /*int*/ atkObject) { - long /*int*/ type = OS.swt_fixed_accessible_get_type(); + static AtkValueIface getParentValueIface (long atkObject) { + long type = OS.swt_fixed_accessible_get_type(); if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_VALUE())) { AtkValueIface iface = new AtkValueIface (); ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_VALUE_GET_IFACE (atkObject))); @@ -4282,7 +4282,7 @@ class AccessibleObject { * * @return 0, this is a void function -- the value is stored in the parameter */ - static long /*int*/ atkValue_get_current_value (long /*int*/ atkObject, long /*int*/ value) { + static long atkValue_get_current_value (long atkObject, long value) { AccessibleObject object = getAccessibleObject (atkObject); AtkValueIface iface = getParentValueIface (atkObject); if (iface != null && iface.get_current_value != 0) { @@ -4319,7 +4319,7 @@ class AccessibleObject { * * @return 0, this is a void function -- the value is stored in the parameter */ - static long /*int*/ atkValue_get_maximum_value (long /*int*/ atkObject, long /*int*/ value) { + static long atkValue_get_maximum_value (long atkObject, long value) { AccessibleObject object = getAccessibleObject (atkObject); AtkValueIface iface = getParentValueIface (atkObject); if (iface != null && iface.get_maximum_value != 0) { @@ -4356,7 +4356,7 @@ class AccessibleObject { * * @return 0, this is a void function -- the value is stored in the parameter */ - static long /*int*/ atkValue_get_minimum_value (long /*int*/ atkObject, long /*int*/ value) { + static long atkValue_get_minimum_value (long atkObject, long value) { AccessibleObject object = getAccessibleObject (atkObject); AtkValueIface iface = getParentValueIface (atkObject); if (iface != null && iface.get_minimum_value != 0) { @@ -4392,7 +4392,7 @@ class AccessibleObject { * * @return a long int representation of 1 for success, 0 otherwise */ - static long /*int*/ atkValue_set_current_value (long /*int*/ atkObject, long /*int*/ value) { + static long atkValue_set_current_value (long atkObject, long value) { AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { Accessible accessible = object.accessible; @@ -4408,7 +4408,7 @@ class AccessibleObject { return event.value != null ? 1 : 0; } } - long /*int*/ parentResult = 0; + long parentResult = 0; AtkValueIface iface = getParentValueIface (atkObject); if (iface != null && iface.set_current_value != 0) { parentResult = ATK.call (iface.set_current_value, atkObject, value); @@ -4424,7 +4424,7 @@ class AccessibleObject { * * @return an AccessibleObject associated with the provided AtkObject pointer */ - static AccessibleObject getAccessibleObject (long /*int*/ atkObject) { + static AccessibleObject getAccessibleObject (long atkObject) { AccessibleObject object = AccessibleObjects.get (new LONG (atkObject)); if (object == null) return null; if (object.accessible == null) return null; @@ -4457,9 +4457,9 @@ class AccessibleObject { String parentText = ""; //$NON-NLS-1$ AtkTextIface iface = getParentTextIface (atkHandle); if (iface != null && iface.get_character_count != 0) { - long /*int*/ characterCount = ATK.call (iface.get_character_count, atkHandle); + long characterCount = ATK.call (iface.get_character_count, atkHandle); if (characterCount > 0 && iface.get_text != 0) { - long /*int*/ parentResult = ATK.call (iface.get_text, atkHandle, 0, characterCount); + long parentResult = ATK.call (iface.get_text, atkHandle, 0, characterCount); if (parentResult != 0) { parentText = getString (parentResult); OS.g_free(parentResult); @@ -4478,7 +4478,7 @@ class AccessibleObject { return null; } - static long /*int*/ gObjectClass_finalize (long /*int*/ atkObject) { + static long gObjectClass_finalize (long atkObject) { /* * GObject destruction is handled in os_custom.c in GTK3. * AccessibleObject has to be removed from the map of AccessibleObjects, though. @@ -4520,7 +4520,7 @@ class AccessibleObject { * @param y a pointer to an integer which represents the y coordinate * @return 0 */ - static long /*int*/ toDisplay (long /*int*/ gdkResource, long /*int*/ x, long /*int*/ y) { + static long toDisplay (long gdkResource, long x, long y) { int [] origin_x = new int [1], origin_y = new int [1]; if (gdkResource == 0) { // memmove anyways to prevent garbage data in the pointers @@ -4541,18 +4541,18 @@ class AccessibleObject { } static void windowPoint (AccessibleObject object, int [] x, int [] y) { - long /*int*/ widget = GTK.gtk_accessible_get_widget(object.atkHandle); + long widget = GTK.gtk_accessible_get_widget(object.atkHandle); while (widget == 0 && object.parent != null) { object = object.parent; widget = GTK.gtk_accessible_get_widget(object.atkHandle); } if (widget == 0) return; - long /*int*/ topLevel = GTK.gtk_widget_get_toplevel (widget); + long topLevel = GTK.gtk_widget_get_toplevel (widget); if (GTK.GTK4) { - long /*int*/ surface = GTK.gtk_widget_get_surface (topLevel); + long surface = GTK.gtk_widget_get_surface (topLevel); GDK.gdk_surface_get_origin (surface, x, y); } else { - long /*int*/ window = GTK.gtk_widget_get_window (topLevel); + long window = GTK.gtk_widget_get_window (topLevel); GDK.gdk_window_get_origin (window, x, y); } } @@ -4763,7 +4763,7 @@ class AccessibleObject { OS.g_object_notify(atkHandle, ATK.accessible_hypertext_nlinks); break; case ACC.EVENT_ATTRIBUTE_CHANGED: - long /*int*/ gType = OS.G_OBJECT_TYPE(atkHandle); + long gType = OS.G_OBJECT_TYPE(atkHandle); if (gType == GTK.GTK_TYPE_TEXT_VIEW_ACCESSIBLE()) break; OS.g_signal_emit_by_name (atkHandle, ATK.attributes_changed); break; @@ -4917,8 +4917,8 @@ class AccessibleObject { object = event.accessible.getAccessibleObject(); if (object != null) OS.g_object_ref(object.atkHandle); } else { - long /*int*/ type = OS.G_OBJECT_TYPE (accessible.getControlHandle()); - long /*int*/ widget = accessible.getControlHandle(); + long type = OS.G_OBJECT_TYPE (accessible.getControlHandle()); + long widget = accessible.getControlHandle(); object = new AccessibleObject(type, widget, accessible, true); } object.id = id; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java index 6bc6c755a1..43389526ad 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java @@ -162,7 +162,7 @@ protected void javaToNative (Object object, TransferData transferData) { } byte[] buffer = (byte[])object; if (buffer.length == 0) return; - long /*int*/ pValue = OS.g_malloc(buffer.length); + long pValue = OS.g_malloc(buffer.length); if (pValue == 0) return; C.memmove(pValue, buffer, buffer.length); transferData.length = buffer.length; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java index 635196b225..8dbffe1c41 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java @@ -34,14 +34,14 @@ public class Clipboard { private Display display; - static long /*int*/ GTKCLIPBOARD; - static long /*int*/ GTKPRIMARYCLIPBOARD; - private static long /*int*/ TARGET; + static long GTKCLIPBOARD; + static long GTKPRIMARYCLIPBOARD; + private static long TARGET; static { GTKCLIPBOARD = GTK.gtk_clipboard_get(GDK.GDK_NONE); byte[] buffer = Converter.wcsToMbcs("PRIMARY", true); - long /*int*/ primary = GDK.gdk_atom_intern(buffer, false); + long primary = GDK.gdk_atom_intern(buffer, false); GTKPRIMARYCLIPBOARD = GTK.gtk_clipboard_get(primary); buffer = Converter.wcsToMbcs("TARGETS", true); TARGET = GDK.gdk_atom_intern(buffer, false); @@ -289,7 +289,7 @@ public Object getContents(Transfer transfer) { public Object getContents(Transfer transfer, int clipboards) { checkWidget(); if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT); - long /*int*/ selection_data = 0; + long selection_data = 0; int[] typeIds = transfer.getTypeIds(); for (int i = 0; i < typeIds.length; i++) { if ((clipboards & DND.CLIPBOARD) != 0) { @@ -563,7 +563,7 @@ public String[] getAvailableTypeNames() { String[] result = new String[types1.length + types2.length]; int count = 0; for (int i = 0; i < types1.length; i++) { - long /*int*/ pName = GDK.gdk_atom_name(types1[i]); + long pName = GDK.gdk_atom_name(types1[i]); if (pName == 0) { continue; } @@ -573,7 +573,7 @@ public String[] getAvailableTypeNames() { result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (buffer)); } for (int i = 0; i < types2.length; i++) { - long /*int*/ pName = GDK.gdk_atom_name(types2[i]); + long pName = GDK.gdk_atom_name(types2[i]); if (pName == 0) { continue; } @@ -592,7 +592,7 @@ public String[] getAvailableTypeNames() { private int[] getAvailablePrimaryTypes() { int[] types = new int[0]; - long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET); + long selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET); /* * This call to gdk_threads_leave() is a temporary work around * to avoid deadlocks when gdk_threads_init() is called by native @@ -604,7 +604,7 @@ private int[] getAvailablePrimaryTypes() { try { int length = GTK.gtk_selection_data_get_length(selection_data); int format = GTK.gtk_selection_data_get_format(selection_data); - long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data); + long data = GTK.gtk_selection_data_get_data(selection_data); if (length != 0) { types = new int[length * 8 / format]; C.memmove(types, data, length); @@ -617,7 +617,7 @@ private int[] getAvailablePrimaryTypes() { } private int[] getAvailableClipboardTypes () { int[] types = new int[0]; - long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET); + long selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET); /* * This call to gdk_threads_leave() is a temporary work around * to avoid deadlocks when gdk_threads_init() is called by native @@ -629,7 +629,7 @@ private int[] getAvailableClipboardTypes () { try { int length = GTK.gtk_selection_data_get_length(selection_data); int format = GTK.gtk_selection_data_get_format(selection_data); - long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data); + long data = GTK.gtk_selection_data_get_data(selection_data); if (length != 0) { types = new int[length * 8 / format]; C.memmove(types, data, length); @@ -641,12 +641,12 @@ private int[] getAvailableClipboardTypes () { return types; } -long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) { +long gtk_clipboard_wait_for_contents(long clipboard, long target) { long startTime = System.currentTimeMillis(); String key = "org.eclipse.swt.internal.gtk.dispatchEvent"; Display display = this.display; display.setData(key, new int[]{GDK.GDK_PROPERTY_NOTIFY, GDK.GDK_SELECTION_CLEAR, GDK.GDK_SELECTION_REQUEST, GDK.GDK_SELECTION_NOTIFY}); - long /*int*/ selection_data = GTK.gtk_clipboard_wait_for_contents(clipboard, target); + long selection_data = GTK.gtk_clipboard_wait_for_contents(clipboard, target); display.setData(key, null); long duration = System.currentTimeMillis() - startTime; if (selection_data == 0 && duration > 5000) { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java index aa8b181f11..197cc62103 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java @@ -28,7 +28,7 @@ class ClipboardProxy { Object[] primaryClipboardData; Transfer[] primaryClipboardDataTypes; - long /*int*/ clipboardOwner = GTK.gtk_window_new(0); + long clipboardOwner = GTK.gtk_window_new(0); Display display; Clipboard activeClipboard = null; Clipboard activePrimaryClipboard = null; @@ -68,7 +68,7 @@ void clear (Clipboard owner, int clipboards) { } } -long /*int*/ clearFunc(long /*int*/ clipboard,long /*int*/ user_data_or_owner){ +long clearFunc(long clipboard,long user_data_or_owner){ if (clipboard == Clipboard.GTKCLIPBOARD) { activeClipboard = null; clipboardData = null; @@ -107,9 +107,9 @@ void dispose () { * This function provides the data to the clipboard on request. * When this clipboard is disposed, the data will no longer be available. */ -long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long /*int*/ info, long /*int*/ user_data_or_owner){ +long getFunc(long clipboard, long selection_data, long info, long user_data_or_owner){ if (selection_data == 0) return 0; - long /*int*/ target = GTK.gtk_selection_data_get_target(selection_data); + long target = GTK.gtk_selection_data_get_target(selection_data); TransferData tdata = new TransferData(); tdata.type = target; Transfer[] types = (clipboard == Clipboard.GTKCLIPBOARD) ? clipboardDataTypes : primaryClipboardDataTypes; @@ -133,7 +133,7 @@ long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long / boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipboards) { GtkTargetEntry[] entries = new GtkTargetEntry [0]; - long /*int*/ pTargetsList = 0; + long pTargetsList = 0; try { for (int i = 0; i < dataTypes.length; i++) { Transfer transfer = dataTypes[i]; @@ -143,7 +143,7 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo GtkTargetEntry entry = new GtkTargetEntry(); entry.info = typeIds[j]; byte[] buffer = Converter.wcsToMbcs(typeNames[j], true); - long /*int*/ pName = OS.g_malloc(buffer.length); + long pName = OS.g_malloc(buffer.length); C.memmove(pName, buffer, buffer.length); entry.target = pName; GtkTargetEntry[] tmp = new GtkTargetEntry [entries.length + 1]; @@ -162,8 +162,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo if ((clipboards & DND.CLIPBOARD) != 0) { clipboardData = data; clipboardDataTypes = dataTypes; - long /*int*/ getFuncProc = getFunc.getAddress(); - long /*int*/ clearFuncProc = clearFunc.getAddress(); + long getFuncProc = getFunc.getAddress(); + long clearFuncProc = clearFunc.getAddress(); /* * Feature in GTK. When the contents are set again, clipboard_set_with_data() * invokes clearFunc and then, getFunc is not sequentially called. @@ -183,8 +183,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) { primaryClipboardData = data; primaryClipboardDataTypes = dataTypes; - long /*int*/ getFuncProc = getFunc.getAddress(); - long /*int*/ clearFuncProc = clearFunc.getAddress(); + long getFuncProc = getFunc.getAddress(); + long clearFuncProc = clearFunc.getAddress(); if (!GTK.gtk_clipboard_set_with_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) { return false; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java index 1048dd809e..6870ec56a2 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java @@ -111,7 +111,7 @@ public class DragSource extends Widget { Transfer[] transferAgents = new Transfer[0]; DragSourceEffect dragEffect; - long /*int*/ targetList; + long targetList; //workaround - remember action performed for DragEnd boolean moveData = false; @@ -214,35 +214,35 @@ static int checkStyle (int style) { return style; } -static long /*int*/ DragBegin(long /*int*/ widget, long /*int*/ context){ +static long DragBegin(long widget, long context){ DragSource source = FindDragSource(widget); if (source == null) return 0; source.dragBegin(widget, context); return 0; } -static long /*int*/ DragDataDelete(long /*int*/ widget, long /*int*/ context){ +static long DragDataDelete(long widget, long context){ DragSource source = FindDragSource(widget); if (source == null) return 0; source.dragDataDelete(widget, context); return 0; } -static long /*int*/ DragEnd(long /*int*/ widget, long /*int*/ context){ +static long DragEnd(long widget, long context){ DragSource source = FindDragSource(widget); if (source == null) return 0; source.dragEnd(widget, context); return 0; } -static long /*int*/ DragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, long /*int*/ info, long /*int*/ time){ +static long DragGetData(long widget, long context, long selection_data, long info, long time){ DragSource source = FindDragSource(widget); if (source == null) return 0; source.dragGetData(widget, context, selection_data, (int)/*64*/info, (int)/*64*/time); return 0; } -static DragSource FindDragSource(long /*int*/ handle) { +static DragSource FindDragSource(long handle) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return null; Widget widget = display.findWidget(handle); @@ -312,14 +312,14 @@ void drag(Event dragEvent) { int actions = opToOsOp(getStyle()); Image image = event.image; - long /*int*/ context; + long context; context = GTK.gtk_drag_begin_with_coordinates(control.handle, targetList, actions, 1, 0, -1, -1); if (context != 0 && image != null) { GTK.gtk_drag_set_icon_surface(context, image.surface); } } -void dragBegin(long /*int*/ widget, long /*int*/ context) { +void dragBegin(long widget, long context) { /* * Bug 515035: GTK DnD hijacks the D&D logic we have in SWT. * When we recieve the signal from GTK of DragBegin, we will @@ -343,7 +343,7 @@ void dragBegin(long /*int*/ widget, long /*int*/ context) { } } -void dragEnd(long /*int*/ widget, long /*int*/ context){ +void dragEnd(long widget, long context){ /* * Bug in GTK. If a drag is initiated using gtk_drag_begin and the * mouse is released immediately, the mouse and keyboard remain @@ -353,17 +353,17 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){ * NOTE: We believe that it is never an error to ungrab when * a drag is finished. */ - long /*int*/ display; + long display; if (GTK.GTK4) { display = GDK.gdk_surface_get_display(GTK.gtk_widget_get_surface(widget)); } else { display = GDK.gdk_window_get_display(GTK.gtk_widget_get_window(widget)); } - long /*int*/ pointer = GDK.gdk_get_pointer(display); - long /*int*/ keyboard = GDK.gdk_device_get_associated_device(pointer); + long pointer = GDK.gdk_get_pointer(display); + long keyboard = GDK.gdk_device_get_associated_device(pointer); if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { - long /*int*/ pointer_seat = GDK.gdk_device_get_seat(pointer); - long /*int*/ keyboard_seat = GDK.gdk_device_get_seat(keyboard); + long pointer_seat = GDK.gdk_device_get_seat(pointer); + long keyboard_seat = GDK.gdk_device_get_seat(keyboard); GDK.gdk_seat_ungrab(pointer_seat); GDK.gdk_seat_ungrab(keyboard_seat); } else { @@ -373,7 +373,7 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){ int operation = DND.DROP_NONE; if (context != 0) { - long /*int*/ dest_window = 0; + long dest_window = 0; int action = 0; /* * Feature in GTK: dest_window information is not gathered here in Wayland as the @@ -411,7 +411,7 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){ if (this.control instanceof Table || this.control instanceof Tree || this.control instanceof List) { - long /*int*/ selection = GTK.gtk_tree_view_get_selection (widget); + long selection = GTK.gtk_tree_view_get_selection (widget); GTK.gtk_tree_selection_set_select_function(selection,0,0,0); } @@ -425,12 +425,12 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){ moveData = false; } -void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, int info, int time){ +void dragGetData(long widget, long context, long selection_data, int info, int time){ if (selection_data == 0) return; int length = GTK.gtk_selection_data_get_length(selection_data); int format = GTK.gtk_selection_data_get_format(selection_data); - long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data); - long /*int*/ target = GTK.gtk_selection_data_get_target(selection_data); + long data = GTK.gtk_selection_data_get_data(selection_data); + long target = GTK.gtk_selection_data_get_target(selection_data); if (target == 0) return; TransferData transferData = new TransferData(); @@ -462,7 +462,7 @@ void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selecti return; } -void dragDataDelete(long /*int*/ widget, long /*int*/ context){ +void dragDataDelete(long widget, long context){ moveData = true; } @@ -650,7 +650,7 @@ public void setTransfer(Transfer... transferAgents){ } } - long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); + long pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); for (int i = 0; i < targets.length; i++) { OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java index 8cd3ac61bf..c2d3bb191f 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java @@ -240,33 +240,33 @@ static int checkStyle (int style) { return style; } -static long /*int*/ Drag_Data_Received ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ data, long /*int*/ info, long /*int*/ time){ +static long Drag_Data_Received ( long widget, long context, long x, long y, long data, long info, long time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; target.drag_data_received (widget, context, (int)/*64*/x, (int)/*64*/y, data, (int)/*64*/info, (int)/*64*/time); return 0; } -static long /*int*/ Drag_Drop(long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time) { +static long Drag_Drop(long widget, long context, long x, long y, long time) { DropTarget target = FindDropTarget(widget); if (target == null) return 0; return target.drag_drop (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; } -static long /*int*/ Drag_Leave ( long /*int*/ widget, long /*int*/ context, long /*int*/ time){ +static long Drag_Leave ( long widget, long context, long time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; target.drag_leave (widget, context, (int)/*64*/time); return 0; } -static long /*int*/ Drag_Motion ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time){ +static long Drag_Motion ( long widget, long context, long x, long y, long time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; return target.drag_motion (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; } -static DropTarget FindDropTarget(long /*int*/ handle) { +static DropTarget FindDropTarget(long handle) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return null; Widget widget = display.findWidget(handle); @@ -328,7 +328,7 @@ protected void checkSubclass () { } } -void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int y, long /*int*/ selection_data, int info, int time){ +void drag_data_received ( long widget, long context, int x, int y, long selection_data, int info, int time){ DNDEvent event = new DNDEvent(); if (selection_data == 0 || !setEventData(context, x, y, time, event)) { keyOperation = -1; @@ -343,8 +343,8 @@ void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int TransferData transferData = new TransferData(); int length = GTK.gtk_selection_data_get_length(selection_data); int format = GTK.gtk_selection_data_get_format(selection_data); - long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data); - long /*int*/ type = GTK.gtk_selection_data_get_data_type(selection_data); + long data = GTK.gtk_selection_data_get_data(selection_data); + long type = GTK.gtk_selection_data_get_data_type(selection_data); if (data != 0) { transferData.type = type; transferData.length = length; @@ -378,7 +378,7 @@ void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int return; } -boolean drag_drop(long /*int*/ widget, long /*int*/ context, int x, int y, int time) { +boolean drag_drop(long widget, long context, int x, int y, int time) { DNDEvent event = new DNDEvent(); if (!setEventData(context, x, y, time, event)) { keyOperation = -1; @@ -415,7 +415,7 @@ boolean drag_drop(long /*int*/ widget, long /*int*/ context, int x, int y, int t return true; } -void drag_leave ( long /*int*/ widget, long /*int*/ context, int time){ +void drag_leave ( long widget, long context, int time){ updateDragOverHover(0, null); if (keyOperation == -1) return; @@ -428,7 +428,7 @@ void drag_leave ( long /*int*/ widget, long /*int*/ context, int time){ notifyListeners(DND.DragLeave, event); } -boolean drag_motion ( long /*int*/ widget, long /*int*/ context, int x, int y, int time){ +boolean drag_motion ( long widget, long context, int x, int y, int time){ int oldKeyOperation = keyOperation; /* @@ -567,14 +567,14 @@ public DropTargetEffect getDropTargetEffect() { int getOperationFromKeyState() { int[] state = new int[1]; - long /*int*/ pointer = GDK.gdk_get_pointer (GDK.gdk_display_get_default()); + long pointer = GDK.gdk_get_pointer (GDK.gdk_display_get_default()); if (GTK.GTK4) { /* * TODO: calling gdk_window_get_device_position() here * uses gdk_get_default_root_window(), which doesn't exist on GTK4. */ } else { - long /*int*/ root = GDK.gdk_get_default_root_window (); + long root = GDK.gdk_get_default_root_window (); GDK.gdk_window_get_device_position(root, pointer, null, null, state); } boolean ctrl = (state[0] & GDK.GDK_CONTROL_MASK) != 0; @@ -701,7 +701,7 @@ public void setTransfer(Transfer... transferAgents){ } } - long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); + long pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); for (int i = 0; i < targets.length; i++) { OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof); } @@ -709,7 +709,7 @@ public void setTransfer(Transfer... transferAgents){ int actions = opToOsOp(getStyle()); if (control instanceof Combo) { if ((control.getStyle() & SWT.READ_ONLY) == 0) { - long /*int*/ entryHandle = GTK.gtk_bin_get_child (control.handle); + long entryHandle = GTK.gtk_bin_get_child (control.handle); if (entryHandle != 0) { GTK.gtk_drag_dest_unset(entryHandle); } @@ -735,9 +735,9 @@ public void setDropTargetEffect(DropTargetEffect effect) { dropEffect = effect; } -boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent event) { +boolean setEventData(long context, int x, int y, int time, DNDEvent event) { if (context == 0) return false; - long /*int*/ targets = GDK.gdk_drag_context_list_targets(context); + long targets = GDK.gdk_drag_context_list_targets(context); int actions = GDK.gdk_drag_context_get_actions(context); if (targets == 0) return false; @@ -760,7 +760,7 @@ boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent even // Get allowed transfer types TransferData[] dataTypes = new TransferData[0]; while (targets != 0) { - long /*int*/ pData = OS.g_list_data(targets); + long pData = OS.g_list_data(targets); TransferData data = new TransferData(); data.type = pData; for (int j = 0; j < transferAgents.length; j++) { @@ -778,10 +778,10 @@ boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent even if (dataTypes.length == 0) return false; int [] origin_x = new int[1], origin_y = new int[1]; if (GTK.GTK4) { - long /*int*/ surface = GTK.gtk_widget_get_surface (control.handle); + long surface = GTK.gtk_widget_get_surface (control.handle); GDK.gdk_surface_get_origin(surface, origin_x, origin_y); } else { - long /*int*/ window = GTK.gtk_widget_get_window (control.handle); + long window = GTK.gtk_widget_get_window (control.handle); GDK.gdk_window_get_origin(window, origin_x, origin_y); } Point coordinates = DPIUtil.autoScaleDown(new Point(origin_x[0] + x, origin_y[0] + y)); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java index f21305b2c2..0c55180d39 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java @@ -91,12 +91,12 @@ public void javaToNative(Object object, TransferData transferData) { char[] chars = new char[length]; string.getChars(0, length, chars, 0); long /*int*/[] error = new long /*int*/[1]; - long /*int*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); + long utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); if (error[0] != 0 || utf8Ptr == 0) continue; - long /*int*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); + long localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); OS.g_free(utf8Ptr); if (error[0] != 0 || localePtr == 0) continue; - long /*int*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error); + long uriPtr = OS.g_filename_to_uri(localePtr, 0, error); OS.g_free(localePtr); if (error[0] != 0 || uriPtr == 0) continue; length = C.strlen(uriPtr); @@ -116,7 +116,7 @@ public void javaToNative(Object object, TransferData transferData) { buffer = newBuffer; } if (buffer.length == 0) return; - long /*int*/ ptr = OS.g_malloc(buffer.length+1); + long ptr = OS.g_malloc(buffer.length+1); C.memset(ptr, '\0', buffer.length+1); C.memmove(ptr, buffer, buffer.length); transferData.pValue = ptr; @@ -151,7 +151,7 @@ public Object nativeToJava(TransferData transferData) { if (!(gnomeList && offset == 0)) { /* The content of the first line in a gnome-list is always either 'copy' or 'cut' */ int size = i - offset; - long /*int*/ file = OS.g_malloc(size + 1); + long file = OS.g_malloc(size + 1); byte[] fileBuffer = new byte[size + 1]; System.arraycopy(temp, offset, fileBuffer, 0, size); C.memmove(file, fileBuffer, size + 1); @@ -165,7 +165,7 @@ public Object nativeToJava(TransferData transferData) { } if (offset < temp.length - sepLength) { int size = temp.length - offset; - long /*int*/ file = OS.g_malloc(size + 1); + long file = OS.g_malloc(size + 1); byte[] fileBuffer = new byte[size + 1]; System.arraycopy(temp, offset, fileBuffer, 0, size); C.memmove(file, fileBuffer, size + 1); @@ -177,15 +177,15 @@ public Object nativeToJava(TransferData transferData) { String[] fileNames = new String[0]; for (int i = 0; i < files.length; i++) { long /*int*/[] error = new long /*int*/[1]; - long /*int*/ localePtr = OS.g_filename_from_uri(files[i], null, error); + long localePtr = OS.g_filename_from_uri(files[i], null, error); OS.g_free(files[i]); if (error[0] != 0 || localePtr == 0) continue; - long /*int*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null); + long utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (localePtr); if (localePtr != utf8Ptr) OS.g_free (localePtr); if (utf8Ptr == 0) continue; long /*int*/[] items_written = new long /*int*/[1]; - long /*int*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null); + long utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null); OS.g_free(utf8Ptr); if (utf16Ptr == 0) continue; length = (int)/*64*/items_written[0]; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java index 1e95136f2c..ce49bb8953 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java @@ -68,7 +68,7 @@ public void javaToNative (Object object, TransferData transferData){ String string = (String)object; byte[] utf8 = Converter.wcsToMbcs(string, true); int byteCount = utf8.length; - long /*int*/ pValue = OS.g_malloc(byteCount); + long pValue = OS.g_malloc(byteCount); if (pValue == 0) return; C.memmove(pValue, utf8, byteCount); transferData.length = byteCount; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java index 609b82cde1..34fa8fee05 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java @@ -91,7 +91,7 @@ public void javaToNative(Object object, TransferData transferData) { ImageData imgData = (ImageData)object; if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); Image image = new Image(Display.getCurrent(), imgData); - long /*int*/ pixbuf = ImageList.createPixbuf(image); + long pixbuf = ImageList.createPixbuf(image); if (pixbuf != 0) { String typeStr = ""; if (transferData.type == JPEG_ID) typeStr = "jpeg"; @@ -106,8 +106,8 @@ public void javaToNative(Object object, TransferData transferData) { else if (transferData.type == XPM_ID) typeStr = "xpm"; else if (transferData.type == XV_ID) typeStr = "xv"; byte[] type = Converter.wcsToMbcs(typeStr, true); - long /*int*/ [] buffer = new long /*int*/ [1]; - long /*int*/ [] len = new long /*int*/ [1]; + long [] buffer = new long [1]; + long [] len = new long [1]; if (type == null) return; GDK.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null); OS.g_object_unref(pixbuf); @@ -133,11 +133,11 @@ public void javaToNative(Object object, TransferData transferData) { public Object nativeToJava(TransferData transferData) { ImageData imgData = null; if (transferData.length > 0) { - long /*int*/ loader = GDK.gdk_pixbuf_loader_new(); + long loader = GDK.gdk_pixbuf_loader_new(); try { GDK.gdk_pixbuf_loader_write(loader, transferData.pValue, transferData.length, null); GDK.gdk_pixbuf_loader_close(loader, null); - long /*int*/ pixbuf = GDK.gdk_pixbuf_loader_get_pixbuf(loader); + long pixbuf = GDK.gdk_pixbuf_loader_get_pixbuf(loader); if (pixbuf != 0) { Image img = Image.gtk_new_from_pixbuf(Display.getCurrent(), SWT.BITMAP, pixbuf); imgData = img.getImageData(); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java index 240ac68b23..d6ca939272 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java @@ -69,7 +69,7 @@ public void javaToNative (Object object, TransferData transferData){ } String string = (String)object; byte [] buffer = Converter.wcsToMbcs (string, true); - long /*int*/ pValue = OS.g_malloc(buffer.length); + long pValue = OS.g_malloc(buffer.length); if (pValue == 0) return; C.memmove(pValue, buffer, buffer.length); transferData.length = buffer.length - 1; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java index 5c919d329f..af900f9731 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java @@ -94,28 +94,28 @@ public class TableDragSourceEffect extends DragSourceEffect { * in versions smaller than 2.2.4 if the model is NULL. The fix is * to give a valid pointer instead. */ - long /*int*/ handle = table.handle; - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); - long /*int*/ [] model = null; - long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, model); + long handle = table.handle; + long selection = GTK.gtk_tree_view_get_selection (handle); + long [] model = null; + long list = GTK.gtk_tree_selection_get_selected_rows (selection, model); if (list == 0) return null; int count = Math.min(10, OS.g_list_length (list)); - long /*int*/ originalList = list; + long originalList = list; Display display = table.getDisplay(); if (count == 1) { - long /*int*/ path = OS.g_list_nth_data (list, 0); - long /*int*/ icon = GTK.gtk_tree_view_create_row_drag_icon (handle, path); + long path = OS.g_list_nth_data (list, 0); + long icon = GTK.gtk_tree_view_create_row_drag_icon (handle, path); dragSourceImage = Image.gtk_new (display, SWT.ICON, icon, 0); GTK.gtk_tree_path_free (path); } else { int width = 0, height = 0; int[] w = new int[1], h = new int[1]; int[] yy = new int[count], hh = new int[count]; - long /*int*/ [] icons = new long /*int*/ [count]; + long [] icons = new long [count]; GdkRectangle rect = new GdkRectangle (); for (int i=0; iGetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)glXChooseVisual((Display *)arg0, arg1, lparg2); + rc = (jlong)glXChooseVisual((Display *)arg0, arg1, lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); GLX_NATIVE_EXIT(env, that, _1glXChooseVisual_FUNC); @@ -76,14 +76,14 @@ fail: #endif #ifndef NO__1glXCreateContext -JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXCreateContext) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jboolean arg3) +JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXCreateContext) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jboolean arg3) { XVisualInfo _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GLX_NATIVE_ENTER(env, that, _1glXCreateContext_FUNC); if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3); + rc = (jlong)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3); fail: if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1); GLX_NATIVE_EXIT(env, that, _1glXCreateContext_FUNC); @@ -93,7 +93,7 @@ fail: #ifndef NO__1glXDestroyContext JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GLX_NATIVE_ENTER(env, that, _1glXDestroyContext_FUNC); glXDestroyContext((Display *)arg0, (GLXContext)arg1); @@ -103,7 +103,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext) #ifndef NO__1glXGetConfig JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetConfig) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2, jintArray arg3) { XVisualInfo _arg1, *lparg1=NULL; jint *lparg3=NULL; @@ -121,12 +121,12 @@ fail: #endif #ifndef NO__1glXGetCurrentContext -JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentContext) +JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXGetCurrentContext) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GLX_NATIVE_ENTER(env, that, _1glXGetCurrentContext_FUNC); - rc = (jintLong)glXGetCurrentContext(); + rc = (jlong)glXGetCurrentContext(); GLX_NATIVE_EXIT(env, that, _1glXGetCurrentContext_FUNC); return rc; } @@ -134,7 +134,7 @@ JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentContext) #ifndef NO__1glXMakeCurrent JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jboolean rc = 0; GLX_NATIVE_ENTER(env, that, _1glXMakeCurrent_FUNC); @@ -146,7 +146,7 @@ JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent) #ifndef NO__1glXSwapBuffers JNIEXPORT void JNICALL GLX_NATIVE(_1glXSwapBuffers) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GLX_NATIVE_ENTER(env, that, _1glXSwapBuffers_FUNC); glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1); @@ -156,7 +156,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXSwapBuffers) #ifndef NO_memmove JNIEXPORT void JNICALL GLX_NATIVE(memmove) - (JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { XVisualInfo _arg0, *lparg0=NULL; GLX_NATIVE_ENTER(env, that, memmove_FUNC); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c index 97b951c846..921053631b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -31,7 +31,7 @@ void cacheXVisualInfoFields(JNIEnv *env, jobject lpObject) { if (XVisualInfoFc.cached) return; XVisualInfoFc.clazz = (*env)->GetObjectClass(env, lpObject); - XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", I_J); + XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", "J"); XVisualInfoFc.visualid = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visualid", "I"); XVisualInfoFc.screen = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "screen", "I"); XVisualInfoFc.depth = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "depth", "I"); @@ -47,7 +47,7 @@ void cacheXVisualInfoFields(JNIEnv *env, jobject lpObject) XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct) { if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject); - lpStruct->visual = (Visual *)(*env)->GetIntLongField(env, lpObject, XVisualInfoFc.visual); + lpStruct->visual = (Visual *)(*env)->GetLongField(env, lpObject, XVisualInfoFc.visual); lpStruct->visualid = (*env)->GetIntField(env, lpObject, XVisualInfoFc.visualid); lpStruct->screen = (*env)->GetIntField(env, lpObject, XVisualInfoFc.screen); lpStruct->depth = (*env)->GetIntField(env, lpObject, XVisualInfoFc.depth); @@ -63,7 +63,7 @@ XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lp void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct) { if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, XVisualInfoFc.visual, (jintLong)lpStruct->visual); + (*env)->SetLongField(env, lpObject, XVisualInfoFc.visual, (jlong)lpStruct->visual); (*env)->SetIntField(env, lpObject, XVisualInfoFc.visualid, (jint)lpStruct->visualid); (*env)->SetIntField(env, lpObject, XVisualInfoFc.screen, (jint)lpStruct->screen); (*env)->SetIntField(env, lpObject, XVisualInfoFc.depth, (jint)lpStruct->depth); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java index b3738d2a8d..b2a7d92283 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java @@ -234,8 +234,8 @@ public static final void glViewport(int x, int y, int width, int height) { } } /** @param dpy cast=(Display *) */ -public static final native long /*int*/ _glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList); -public static final long /*int*/ glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList) { +public static final native long _glXChooseVisual(long dpy, int screen, int[] attribList); +public static final long glXChooseVisual(long dpy, int screen, int[] attribList) { lock.lock(); try { return _glXChooseVisual(dpy, screen, attribList); @@ -247,8 +247,8 @@ public static final long /*int*/ glXChooseVisual(long /*int*/ dpy, int screen, i * @param dpy cast=(Display *) * @param shareList cast=(GLXContext) */ -public static final native long /*int*/ _glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct); -public static final long /*int*/ glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct) { +public static final native long _glXCreateContext(long dpy, XVisualInfo vis, long shareList, boolean direct); +public static final long glXCreateContext(long dpy, XVisualInfo vis, long shareList, boolean direct) { lock.lock(); try { return _glXCreateContext(dpy, vis, shareList, direct); @@ -260,8 +260,8 @@ public static final long /*int*/ glXCreateContext(long /*int*/ dpy, XVisualInfo * @param dpy cast=(Display *) * @param ctx cast=(GLXContext) */ -public static final native void _glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx); -public static final void glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx) { +public static final native void _glXDestroyContext(long dpy, long ctx); +public static final void glXDestroyContext(long dpy, long ctx) { lock.lock(); try { _glXDestroyContext(dpy, ctx); @@ -270,8 +270,8 @@ public static final void glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx) { } } /** @param dpy cast=(Display *) */ -public static final native int _glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value); -public static final int glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value) { +public static final native int _glXGetConfig(long dpy, XVisualInfo vis, int attrib, int[] value); +public static final int glXGetConfig(long dpy, XVisualInfo vis, int attrib, int[] value) { lock.lock(); try { return _glXGetConfig(dpy, vis, attrib, value); @@ -279,8 +279,8 @@ public static final int glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attr lock.unlock(); } } -public static final native long /*int*/ _glXGetCurrentContext(); -public static final long /*int*/ glXGetCurrentContext() { +public static final native long _glXGetCurrentContext(); +public static final long glXGetCurrentContext() { lock.lock(); try { return _glXGetCurrentContext(); @@ -293,8 +293,8 @@ public static final long /*int*/ glXGetCurrentContext() { * @param drawable cast=(GLXDrawable) * @param ctx cast=(GLXContext) */ -public static final native boolean _glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx); -public static final boolean glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx) { +public static final native boolean _glXMakeCurrent(long dpy, long drawable, long ctx); +public static final boolean glXMakeCurrent(long dpy, long drawable, long ctx) { lock.lock(); try { return _glXMakeCurrent(dpy, drawable, ctx); @@ -306,8 +306,8 @@ public static final boolean glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawab * @param dpy cast=(Display *) * @param drawable cast=(GLXDrawable) */ -public static final native void _glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable); -public static final void glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable) { +public static final native void _glXSwapBuffers(long dpy, long drawable); +public static final void glXSwapBuffers(long dpy, long drawable) { lock.lock(); try { _glXSwapBuffers(dpy, drawable); @@ -319,5 +319,5 @@ public static final void glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable) * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(XVisualInfo dest, long /*int*/ src, int size); +public static final native void memmove(XVisualInfo dest, long src, int size); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java index 602acad9fb..c0fc008e73 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.opengl.glx; public class XVisualInfo { /** @field cast=(Visual *) */ - public long /*int*/ visual; + public long visual; public int visualid; public int screen; public int depth; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java index 214b8e6bb0..ad4b67c116 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java @@ -31,9 +31,9 @@ import org.eclipse.swt.widgets.*; */ public class GLCanvas extends Canvas { - long /*int*/ context; - long /*int*/ xWindow; - long /*int*/ glWindow; + long context; + long xWindow; + long glWindow; XVisualInfo vinfo; static final int MAX_ATTRIBUTES = 32; @@ -109,10 +109,10 @@ public GLCanvas (Composite parent, int style, GLData data) { } glxAttrib [pos++] = 0; GTK.gtk_widget_realize (handle); - long /*int*/ window = GTK.gtk_widget_get_window (handle); + long window = GTK.gtk_widget_get_window (handle); - long /*int*/ xDisplay = GDK.gdk_x11_display_get_xdisplay(GDK.gdk_window_get_display(window)); - long /*int*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib); + long xDisplay = GDK.gdk_x11_display_get_xdisplay(GDK.gdk_window_get_display(window)); + long infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib); if (infoPtr == 0) { dispose (); SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH); @@ -120,9 +120,9 @@ public GLCanvas (Composite parent, int style, GLData data) { vinfo = new XVisualInfo (); GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof); OS.XFree (infoPtr); - long /*int*/ screen = GDK.gdk_screen_get_default (); - long /*int*/ gdkvisual = GDK.gdk_x11_screen_lookup_visual (screen, vinfo.visualid); - long /*int*/ share = data.shareContext != null ? data.shareContext.context : 0; + long screen = GDK.gdk_screen_get_default (); + long gdkvisual = GDK.gdk_x11_screen_lookup_visual (screen, vinfo.visualid); + long share = data.shareContext != null ? data.shareContext.context : 0; context = GLX.glXCreateContext (xDisplay, vinfo, share, true); if (context == 0) SWT.error (SWT.ERROR_NO_HANDLES); GdkWindowAttr attrs = new GdkWindowAttr (); @@ -162,8 +162,8 @@ public GLCanvas (Composite parent, int style, GLData data) { GDK.gdk_window_resize (glWindow, clientArea.width, clientArea.height); break; case SWT.Dispose: - long /*int*/ window1 = GTK.gtk_widget_get_window (handle); - long /*int*/ xDisplay1 = gdk_x11_display_get_xdisplay (window1); + long window1 = GTK.gtk_widget_get_window (handle); + long xDisplay1 = gdk_x11_display_get_xdisplay (window1); if (context != 0) { if (GLX.glXGetCurrentContext () == context) { GLX.glXMakeCurrent (xDisplay1, 0, 0); @@ -194,8 +194,8 @@ public GLCanvas (Composite parent, int style, GLData data) { */ public GLData getGLData () { checkWidget (); - long /*int*/ window = GTK.gtk_widget_get_window (handle); - long /*int*/ xDisplay = gdk_x11_display_get_xdisplay (window); + long window = GTK.gtk_widget_get_window (handle); + long xDisplay = gdk_x11_display_get_xdisplay (window); GLData data = new GLData (); int [] value = new int [1]; GLX.glXGetConfig (xDisplay, vinfo, GLX.GLX_DOUBLEBUFFER, value); @@ -257,8 +257,8 @@ public boolean isCurrent () { public void setCurrent () { checkWidget (); if (GLX.glXGetCurrentContext () == context) return; - long /*int*/ window = GTK.gtk_widget_get_window (handle); - long /*int*/ xDisplay = gdk_x11_display_get_xdisplay (window); + long window = GTK.gtk_widget_get_window (handle); + long xDisplay = gdk_x11_display_get_xdisplay (window); GLX.glXMakeCurrent (xDisplay, xWindow, context); } @@ -272,12 +272,12 @@ public void setCurrent () { */ public void swapBuffers () { checkWidget (); - long /*int*/ window = GTK.gtk_widget_get_window (handle); - long /*int*/ xDisplay = gdk_x11_display_get_xdisplay (window); + long window = GTK.gtk_widget_get_window (handle); + long xDisplay = gdk_x11_display_get_xdisplay (window); GLX.glXSwapBuffers (xDisplay, xWindow); } -private long /*int*/ gdk_x11_display_get_xdisplay(long /*int*/ window) { +private long gdk_x11_display_get_xdisplay(long window) { return GDK.gdk_x11_display_get_xdisplay(GDK.gdk_window_get_display(window)); } } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c index 7f86efa77c..1347d62edb 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2018 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2019 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -44,7 +44,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(CAIRO_1VERSION_1ENCODE) #ifndef NO__1cairo_1append_1path JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1append_1path) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1append_1path_FUNC); cairo_append_path((cairo_t *)arg0, (cairo_path_t *)arg1); @@ -54,7 +54,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1append_1path) #ifndef NO__1cairo_1arc JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { Cairo_NATIVE_ENTER(env, that, _1cairo_1arc_FUNC); cairo_arc((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5); @@ -64,7 +64,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc) #ifndef NO__1cairo_1arc_1negative JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc_1negative) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { Cairo_NATIVE_ENTER(env, that, _1cairo_1arc_1negative_FUNC); cairo_arc_negative((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5); @@ -74,7 +74,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc_1negative) #ifndef NO__1cairo_1clip JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1clip_FUNC); cairo_clip((cairo_t *)arg0); @@ -84,7 +84,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip) #ifndef NO__1cairo_1close_1path JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1close_1path) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1close_1path_FUNC); cairo_close_path((cairo_t *)arg0); @@ -94,7 +94,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1close_1path) #ifndef NO__1cairo_1copy_1page JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1copy_1page) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1page_FUNC); cairo_copy_page((cairo_t *)arg0); @@ -103,36 +103,36 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1copy_1page) #endif #ifndef NO__1cairo_1copy_1path -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1copy_1path) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1copy_1path) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_FUNC); - rc = (jintLong)cairo_copy_path((cairo_t *)arg0); + rc = (jlong)cairo_copy_path((cairo_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1copy_1path_FUNC); return rc; } #endif #ifndef NO__1cairo_1copy_1path_1flat -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_1flat_FUNC); - rc = (jintLong)cairo_copy_path_flat((cairo_t *)arg0); + rc = (jlong)cairo_copy_path_flat((cairo_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1copy_1path_1flat_FUNC); return rc; } #endif #ifndef NO__1cairo_1create -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1create) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1create) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1create_FUNC); - rc = (jintLong)cairo_create((cairo_surface_t *)arg0); + rc = (jlong)cairo_create((cairo_surface_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1create_FUNC); return rc; } @@ -140,7 +140,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1create) #ifndef NO__1cairo_1curve_1to JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1curve_1to) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) { Cairo_NATIVE_ENTER(env, that, _1cairo_1curve_1to_FUNC); cairo_curve_to((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6); @@ -150,7 +150,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1curve_1to) #ifndef NO__1cairo_1destroy JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1destroy_FUNC); cairo_destroy((cairo_t *)arg0); @@ -160,7 +160,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1destroy) #ifndef NO__1cairo_1fill JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1fill_FUNC); cairo_fill((cairo_t *)arg0); @@ -169,12 +169,12 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill) #endif #ifndef NO__1cairo_1font_1options_1create -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1create_FUNC); - rc = (jintLong)cairo_font_options_create(); + rc = (jlong)cairo_font_options_create(); Cairo_NATIVE_EXIT(env, that, _1cairo_1font_1options_1create_FUNC); return rc; } @@ -182,7 +182,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create) #ifndef NO__1cairo_1font_1options_1destroy JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1destroy_FUNC); cairo_font_options_destroy((cairo_font_options_t *)arg0); @@ -192,7 +192,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1destroy) #ifndef NO__1cairo_1font_1options_1get_1antialias JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1get_1antialias) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1get_1antialias_FUNC); @@ -204,7 +204,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1get_1antialias) #ifndef NO__1cairo_1font_1options_1set_1antialias JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1set_1antialias) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1set_1antialias_FUNC); cairo_font_options_set_antialias((cairo_font_options_t *)arg0, arg1); @@ -214,7 +214,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1set_1antialias) #ifndef NO__1cairo_1get_1antialias JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1antialias) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1antialias_FUNC); @@ -226,7 +226,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1antialias) #ifndef NO__1cairo_1get_1current_1point JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1current_1point) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -243,7 +243,7 @@ fail: #ifndef NO__1cairo_1get_1fill_1rule JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1fill_1rule) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1fill_1rule_FUNC); @@ -254,12 +254,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1fill_1rule) #endif #ifndef NO__1cairo_1get_1font_1face -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1face_FUNC); - rc = (jintLong)cairo_get_font_face((cairo_t *)arg0); + rc = (jlong)cairo_get_font_face((cairo_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1font_1face_FUNC); return rc; } @@ -267,7 +267,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face) #ifndef NO__1cairo_1get_1matrix JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1matrix) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1) { jdouble *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1matrix_FUNC); @@ -281,7 +281,7 @@ fail: #ifndef NO__1cairo_1get_1operator JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1operator) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1operator_FUNC); @@ -292,24 +292,24 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1operator) #endif #ifndef NO__1cairo_1get_1source -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1source) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1get_1source) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1source_FUNC); - rc = (jintLong)cairo_get_source((cairo_t *)arg0); + rc = (jlong)cairo_get_source((cairo_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1source_FUNC); return rc; } #endif #ifndef NO__1cairo_1get_1target -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1target) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1get_1target) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1target_FUNC); - rc = (jintLong)cairo_get_target((cairo_t *)arg0); + rc = (jlong)cairo_get_target((cairo_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1target_FUNC); return rc; } @@ -317,7 +317,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1target) #ifndef NO__1cairo_1get_1tolerance JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1tolerance) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1tolerance_FUNC); @@ -329,7 +329,7 @@ JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1tolerance) #ifndef NO__1cairo_1identity_1matrix JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1identity_1matrix) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1identity_1matrix_FUNC); cairo_identity_matrix((cairo_t *)arg0); @@ -338,24 +338,24 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1identity_1matrix) #endif #ifndef NO__1cairo_1image_1surface_1create -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1create_FUNC); - rc = (jintLong)cairo_image_surface_create(arg0, arg1, arg2); + rc = (jlong)cairo_image_surface_create(arg0, arg1, arg2); Cairo_NATIVE_EXIT(env, that, _1cairo_1image_1surface_1create_FUNC); return rc; } #endif #ifndef NO__1cairo_1image_1surface_1get_1data -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1data) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1data) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1data_FUNC); - rc = (jintLong)cairo_image_surface_get_data((cairo_surface_t *)arg0); + rc = (jlong)cairo_image_surface_get_data((cairo_surface_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1image_1surface_1get_1data_FUNC); return rc; } @@ -363,7 +363,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1data) #ifndef NO__1cairo_1image_1surface_1get_1format JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1format) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1format_FUNC); @@ -375,7 +375,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1format) #ifndef NO__1cairo_1image_1surface_1get_1height JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1height) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1height_FUNC); @@ -387,7 +387,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1height) #ifndef NO__1cairo_1image_1surface_1get_1stride JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1stride) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1stride_FUNC); @@ -399,7 +399,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1stride) #ifndef NO__1cairo_1image_1surface_1get_1width JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1width_FUNC); @@ -411,7 +411,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1width) #ifndef NO__1cairo_1in_1fill JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1fill) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1in_1fill_FUNC); @@ -423,7 +423,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1fill) #ifndef NO__1cairo_1in_1stroke JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1stroke) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1in_1stroke_FUNC); @@ -435,7 +435,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1stroke) #ifndef NO__1cairo_1line_1to JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1line_1to) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1line_1to_FUNC); cairo_line_to((cairo_t *)arg0, arg1, arg2); @@ -445,7 +445,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1line_1to) #ifndef NO__1cairo_1mask JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1mask_FUNC); cairo_mask((cairo_t *)arg0, (cairo_pattern_t *)arg1); @@ -455,7 +455,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask) #ifndef NO__1cairo_1mask_1surface JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3) { Cairo_NATIVE_ENTER(env, that, _1cairo_1mask_1surface_FUNC); cairo_mask_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3); @@ -639,7 +639,7 @@ fail: #ifndef NO__1cairo_1move_1to JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1move_1to) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1move_1to_FUNC); cairo_move_to((cairo_t *)arg0, arg1, arg2); @@ -649,7 +649,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1move_1to) #ifndef NO__1cairo_1new_1path JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1new_1path) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1new_1path_FUNC); cairo_new_path((cairo_t *)arg0); @@ -659,7 +659,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1new_1path) #ifndef NO__1cairo_1paint JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1paint_FUNC); cairo_paint((cairo_t *)arg0); @@ -669,7 +669,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint) #ifndef NO__1cairo_1paint_1with_1alpha JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint_1with_1alpha) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1paint_1with_1alpha_FUNC); cairo_paint_with_alpha((cairo_t *)arg0, arg1); @@ -679,7 +679,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint_1with_1alpha) #ifndef NO__1cairo_1path_1destroy JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1path_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1path_1destroy_FUNC); cairo_path_destroy((cairo_path_t *)arg0); @@ -689,7 +689,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1path_1destroy) #ifndef NO__1cairo_1pattern_1add_1color_1stop_1rgba JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgba) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1add_1color_1stop_1rgba_FUNC); cairo_pattern_add_color_stop_rgba((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4, arg5); @@ -698,24 +698,24 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgba) #endif #ifndef NO__1cairo_1pattern_1create_1for_1surface -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1for_1surface_FUNC); - rc = (jintLong)cairo_pattern_create_for_surface((cairo_surface_t *)arg0); + rc = (jlong)cairo_pattern_create_for_surface((cairo_surface_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1for_1surface_FUNC); return rc; } #endif #ifndef NO__1cairo_1pattern_1create_1linear -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1linear) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1linear) (JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1linear_FUNC); - rc = (jintLong)cairo_pattern_create_linear(arg0, arg1, arg2, arg3); + rc = (jlong)cairo_pattern_create_linear(arg0, arg1, arg2, arg3); Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1linear_FUNC); return rc; } @@ -723,7 +723,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1linear) #ifndef NO__1cairo_1pattern_1destroy JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1destroy_FUNC); cairo_pattern_destroy((cairo_pattern_t *)arg0); @@ -733,7 +733,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1destroy) #ifndef NO__1cairo_1pattern_1get_1extend JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1extend) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1extend_FUNC); @@ -745,7 +745,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1extend) #ifndef NO__1cairo_1pattern_1set_1extend JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1extend) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1extend_FUNC); cairo_pattern_set_extend((cairo_pattern_t *)arg0, arg1); @@ -755,7 +755,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1extend) #ifndef NO__1cairo_1pattern_1set_1filter JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1filter) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1filter_FUNC); cairo_pattern_set_filter((cairo_pattern_t *)arg0, arg1); @@ -765,7 +765,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1filter) #ifndef NO__1cairo_1pattern_1set_1matrix JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1matrix) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1) { jdouble *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1matrix_FUNC); @@ -779,7 +779,7 @@ fail: #ifndef NO__1cairo_1pdf_1surface_1set_1size JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1pdf_1surface_1set_1size_FUNC); /* @@ -797,7 +797,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size) #ifndef NO__1cairo_1pop_1group_1to_1source JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pop_1group_1to_1source) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1pop_1group_1to_1source_FUNC); cairo_pop_group_to_source((cairo_t *)arg0); @@ -807,7 +807,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pop_1group_1to_1source) #ifndef NO__1cairo_1ps_1surface_1set_1size JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1ps_1surface_1set_1size_FUNC); /* @@ -825,7 +825,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size) #ifndef NO__1cairo_1push_1group JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1push_1group) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1push_1group_FUNC); cairo_push_group((cairo_t *)arg0); @@ -835,7 +835,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1push_1group) #ifndef NO__1cairo_1rectangle JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rectangle) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4) { Cairo_NATIVE_ENTER(env, that, _1cairo_1rectangle_FUNC); cairo_rectangle((cairo_t *)arg0, arg1, arg2, arg3, arg4); @@ -844,12 +844,12 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rectangle) #endif #ifndef NO__1cairo_1reference -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1reference) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1reference) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1reference_FUNC); - rc = (jintLong)cairo_reference((cairo_t *)arg0); + rc = (jlong)cairo_reference((cairo_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1reference_FUNC); return rc; } @@ -857,7 +857,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1reference) #ifndef NO__1cairo_1region_1contains_1point JNIEXPORT jboolean JNICALL Cairo_NATIVE(_1cairo_1region_1contains_1point) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1contains_1point_FUNC); @@ -868,14 +868,14 @@ JNIEXPORT jboolean JNICALL Cairo_NATIVE(_1cairo_1region_1contains_1point) #endif #ifndef NO__1cairo_1region_1contains_1rectangle -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1region_1contains_1rectangle) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1region_1contains_1rectangle) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { cairo_rectangle_int_t _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1contains_1rectangle_FUNC); if (arg1) if ((lparg1 = getcairo_rectangle_int_tFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)cairo_region_contains_rectangle((cairo_region_t *)arg0, (cairo_rectangle_int_t *)lparg1); + rc = (jlong)cairo_region_contains_rectangle((cairo_region_t *)arg0, (cairo_rectangle_int_t *)lparg1); fail: if (arg1 && lparg1) setcairo_rectangle_int_tFields(env, arg1, lparg1); Cairo_NATIVE_EXIT(env, that, _1cairo_1region_1contains_1rectangle_FUNC); @@ -884,38 +884,38 @@ fail: #endif #ifndef NO__1cairo_1region_1copy -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1region_1copy) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1region_1copy) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1copy_FUNC); - rc = (jintLong)cairo_region_copy((cairo_region_t *)arg0); + rc = (jlong)cairo_region_copy((cairo_region_t *)arg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1region_1copy_FUNC); return rc; } #endif #ifndef NO__1cairo_1region_1create -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1region_1create) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1region_1create) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1create_FUNC); - rc = (jintLong)cairo_region_create(); + rc = (jlong)cairo_region_create(); Cairo_NATIVE_EXIT(env, that, _1cairo_1region_1create_FUNC); return rc; } #endif #ifndef NO__1cairo_1region_1create_1rectangle -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1region_1create_1rectangle) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1region_1create_1rectangle) (JNIEnv *env, jclass that, jobject arg0) { cairo_rectangle_int_t _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1create_1rectangle_FUNC); if (arg0) if ((lparg0 = getcairo_rectangle_int_tFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)cairo_region_create_rectangle((const cairo_rectangle_int_t *)lparg0); + rc = (jlong)cairo_region_create_rectangle((const cairo_rectangle_int_t *)lparg0); fail: if (arg0 && lparg0) setcairo_rectangle_int_tFields(env, arg0, lparg0); Cairo_NATIVE_EXIT(env, that, _1cairo_1region_1create_1rectangle_FUNC); @@ -925,7 +925,7 @@ fail: #ifndef NO__1cairo_1region_1destroy JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1destroy_FUNC); cairo_region_destroy((cairo_region_t *)arg0); @@ -935,7 +935,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1destroy) #ifndef NO__1cairo_1region_1get_1extents JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1get_1extents) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { cairo_rectangle_int_t _arg1, *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1get_1extents_FUNC); @@ -949,7 +949,7 @@ fail: #ifndef NO__1cairo_1region_1get_1rectangle JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1get_1rectangle) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1get_1rectangle_FUNC); cairo_region_get_rectangle((cairo_region_t *)arg0, arg1, (cairo_rectangle_int_t *)arg2); @@ -959,7 +959,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1get_1rectangle) #ifndef NO__1cairo_1region_1intersect JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1intersect) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1intersect_FUNC); cairo_region_intersect((cairo_region_t *)arg0, (const cairo_region_t *)arg1); @@ -969,7 +969,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1intersect) #ifndef NO__1cairo_1region_1is_1empty JNIEXPORT jboolean JNICALL Cairo_NATIVE(_1cairo_1region_1is_1empty) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1is_1empty_FUNC); @@ -981,7 +981,7 @@ JNIEXPORT jboolean JNICALL Cairo_NATIVE(_1cairo_1region_1is_1empty) #ifndef NO__1cairo_1region_1num_1rectangles JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1region_1num_1rectangles) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1num_1rectangles_FUNC); @@ -993,7 +993,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1region_1num_1rectangles) #ifndef NO__1cairo_1region_1subtract JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1subtract) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1subtract_FUNC); cairo_region_subtract((cairo_region_t *)arg0, (const cairo_region_t *)arg1); @@ -1003,7 +1003,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1subtract) #ifndef NO__1cairo_1region_1translate JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1translate) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1translate_FUNC); cairo_region_translate((cairo_region_t *)arg0, arg1, arg2); @@ -1013,7 +1013,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1translate) #ifndef NO__1cairo_1region_1union JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1union) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1union_FUNC); cairo_region_union((cairo_region_t *)arg0, (const cairo_region_t *)arg1); @@ -1023,7 +1023,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1union) #ifndef NO__1cairo_1region_1union_1rectangle JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1union_1rectangle) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { cairo_rectangle_int_t _arg1, *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1union_1rectangle_FUNC); @@ -1036,7 +1036,7 @@ fail: #ifndef NO__1cairo_1reset_1clip JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1reset_1clip) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1reset_1clip_FUNC); cairo_reset_clip((cairo_t *)arg0); @@ -1046,7 +1046,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1reset_1clip) #ifndef NO__1cairo_1restore JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1restore) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1restore_FUNC); cairo_restore((cairo_t *)arg0); @@ -1056,7 +1056,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1restore) #ifndef NO__1cairo_1rotate JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rotate) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1rotate_FUNC); cairo_rotate((cairo_t *)arg0, arg1); @@ -1066,7 +1066,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rotate) #ifndef NO__1cairo_1save JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1save) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1save_FUNC); cairo_save((cairo_t *)arg0); @@ -1076,7 +1076,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1save) #ifndef NO__1cairo_1scale JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1scale) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1scale_FUNC); cairo_scale((cairo_t *)arg0, arg1, arg2); @@ -1086,7 +1086,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1scale) #ifndef NO__1cairo_1select_1font_1face JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1select_1font_1face) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jint arg3) { jbyte *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1select_1font_1face_FUNC); @@ -1100,7 +1100,7 @@ fail: #ifndef NO__1cairo_1set_1antialias JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1antialias) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1antialias_FUNC); cairo_set_antialias((cairo_t *)arg0, arg1); @@ -1110,7 +1110,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1antialias) #ifndef NO__1cairo_1set_1dash JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1dash) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2, jdouble arg3) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jint arg2, jdouble arg3) { jdouble *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1dash_FUNC); @@ -1124,7 +1124,7 @@ fail: #ifndef NO__1cairo_1set_1fill_1rule JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1fill_1rule) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1fill_1rule_FUNC); cairo_set_fill_rule((cairo_t *)arg0, arg1); @@ -1134,7 +1134,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1fill_1rule) #ifndef NO__1cairo_1set_1font_1face JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1face) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1face_FUNC); cairo_set_font_face((cairo_t *)arg0, (cairo_font_face_t *)arg1); @@ -1144,7 +1144,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1face) #ifndef NO__1cairo_1set_1font_1size JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1size) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1size_FUNC); cairo_set_font_size((cairo_t *)arg0, arg1); @@ -1154,7 +1154,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1size) #ifndef NO__1cairo_1set_1line_1cap JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1cap) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1cap_FUNC); cairo_set_line_cap((cairo_t *)arg0, arg1); @@ -1164,7 +1164,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1cap) #ifndef NO__1cairo_1set_1line_1join JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1join) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1join_FUNC); cairo_set_line_join((cairo_t *)arg0, arg1); @@ -1174,7 +1174,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1join) #ifndef NO__1cairo_1set_1line_1width JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1width) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1width_FUNC); cairo_set_line_width((cairo_t *)arg0, arg1); @@ -1184,7 +1184,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1width) #ifndef NO__1cairo_1set_1matrix JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1matrix) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1) { jdouble *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1matrix_FUNC); @@ -1198,7 +1198,7 @@ fail: #ifndef NO__1cairo_1set_1miter_1limit JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1miter_1limit) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1miter_1limit_FUNC); cairo_set_miter_limit((cairo_t *)arg0, arg1); @@ -1208,7 +1208,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1miter_1limit) #ifndef NO__1cairo_1set_1operator JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1operator) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1operator_FUNC); cairo_set_operator((cairo_t *)arg0, arg1); @@ -1218,7 +1218,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1operator) #ifndef NO__1cairo_1set_1source JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_FUNC); cairo_set_source((cairo_t *)arg0, (cairo_pattern_t *)arg1); @@ -1228,7 +1228,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source) #ifndef NO__1cairo_1set_1source_1rgb JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgb) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_1rgb_FUNC); cairo_set_source_rgb((cairo_t *)arg0, arg1, arg2, arg3); @@ -1238,7 +1238,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgb) #ifndef NO__1cairo_1set_1source_1rgba JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgba) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_1rgba_FUNC); cairo_set_source_rgba((cairo_t *)arg0, arg1, arg2, arg3, arg4); @@ -1248,7 +1248,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgba) #ifndef NO__1cairo_1set_1source_1surface JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_1surface_FUNC); cairo_set_source_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3); @@ -1258,7 +1258,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1surface) #ifndef NO__1cairo_1set_1tolerance JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1tolerance) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1tolerance_FUNC); cairo_set_tolerance((cairo_t *)arg0, arg1); @@ -1268,7 +1268,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1tolerance) #ifndef NO__1cairo_1show_1page JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1page_FUNC); cairo_show_page((cairo_t *)arg0); @@ -1278,7 +1278,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page) #ifndef NO__1cairo_1stroke JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1stroke_FUNC); cairo_stroke((cairo_t *)arg0); @@ -1287,12 +1287,12 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke) #endif #ifndef NO__1cairo_1surface_1create_1similar -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1create_1similar_FUNC); - rc = (jintLong)cairo_surface_create_similar((cairo_surface_t *)arg0, arg1, arg2, arg3); + rc = (jlong)cairo_surface_create_similar((cairo_surface_t *)arg0, arg1, arg2, arg3); Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1create_1similar_FUNC); return rc; } @@ -1300,7 +1300,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar) #ifndef NO__1cairo_1surface_1destroy JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1destroy_FUNC); cairo_surface_destroy((cairo_surface_t *)arg0); @@ -1310,7 +1310,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1destroy) #ifndef NO__1cairo_1surface_1finish JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1finish) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1finish_FUNC); cairo_surface_finish((cairo_surface_t *)arg0); @@ -1320,7 +1320,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1finish) #ifndef NO__1cairo_1surface_1flush JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1flush) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1flush_FUNC); cairo_surface_flush((cairo_surface_t *)arg0); @@ -1330,7 +1330,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1flush) #ifndef NO__1cairo_1surface_1get_1content JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1content) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1content_FUNC); @@ -1342,7 +1342,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1content) #ifndef NO__1cairo_1surface_1get_1device_1scale JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1device_1scale) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -1367,7 +1367,7 @@ fail: #ifndef NO__1cairo_1surface_1get_1type JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1type_FUNC); @@ -1378,12 +1378,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type) #endif #ifndef NO__1cairo_1surface_1get_1user_1data -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1user_1data_FUNC); - rc = (jintLong)cairo_surface_get_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1); + rc = (jlong)cairo_surface_get_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1); Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1get_1user_1data_FUNC); return rc; } @@ -1391,7 +1391,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data) #ifndef NO__1cairo_1surface_1mark_1dirty JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1mark_1dirty) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1mark_1dirty_FUNC); cairo_surface_mark_dirty((cairo_surface_t *)arg0); @@ -1401,7 +1401,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1mark_1dirty) #ifndef NO__1cairo_1surface_1reference JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1reference) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1reference_FUNC); cairo_surface_reference((cairo_surface_t *)arg0); @@ -1411,7 +1411,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1reference) #ifndef NO__1cairo_1surface_1set_1device_1scale JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1device_1scale) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1device_1scale_FUNC); /* @@ -1429,7 +1429,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1device_1scale) #ifndef NO__1cairo_1transform JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1transform) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1) { jdouble *lparg1=NULL; Cairo_NATIVE_ENTER(env, that, _1cairo_1transform_FUNC); @@ -1443,7 +1443,7 @@ fail: #ifndef NO__1cairo_1translate JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1translate) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { Cairo_NATIVE_ENTER(env, that, _1cairo_1translate_FUNC); cairo_translate((cairo_t *)arg0, arg1, arg2); @@ -1453,7 +1453,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1translate) #ifndef NO__1cairo_1user_1to_1device_1distance JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1user_1to_1device_1distance) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -1469,12 +1469,12 @@ fail: #endif #ifndef NO__1cairo_1xlib_1surface_1create -JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4) +JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4) { - jintLong rc = 0; + jlong rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1create_FUNC); - rc = (jintLong)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4); + rc = (jlong)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4); Cairo_NATIVE_EXIT(env, that, _1cairo_1xlib_1surface_1create_FUNC); return rc; } @@ -1482,7 +1482,7 @@ JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create) #ifndef NO__1cairo_1xlib_1surface_1get_1height JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1get_1height) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1get_1height_FUNC); @@ -1502,7 +1502,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1get_1height) #ifndef NO__1cairo_1xlib_1surface_1get_1width JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1get_1width_FUNC); @@ -1568,103 +1568,59 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1version) } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ +JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { cairo_path_data_t _arg0, *lparg0=NULL; -#ifndef JNI64 - Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC); -#else Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC); -#endif if (arg0) if ((lparg0 = getcairo_path_data_tFields(env, arg0, &_arg0)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setcairo_path_data_tFields(env, arg0, lparg0); -#ifndef JNI64 - Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC); -#else Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ +JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { cairo_path_t _arg0, *lparg0=NULL; -#ifndef JNI64 - Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC); -#else Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC); -#endif if (arg0) if ((lparg0 = getcairo_path_tFields(env, arg0, &_arg0)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setcairo_path_tFields(env, arg0, lparg0); -#ifndef JNI64 - Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC); -#else Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ +JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { cairo_rectangle_int_t _arg0, *lparg0=NULL; -#ifndef JNI64 - Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2II_FUNC); -#else Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ_FUNC); -#endif if (arg0) if ((lparg0 = getcairo_rectangle_int_tFields(env, arg0, &_arg0)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setcairo_rectangle_int_tFields(env, arg0, lparg0); -#ifndef JNI64 - Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2II_FUNC); -#else Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3DII) && !defined(JNI64)) || (!defined(NO_memmove___3DJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DII)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DJJ)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3DJJ +JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DJJ) + (JNIEnv *env, jclass that, jdoubleArray arg0, jlong arg1, jlong arg2) { jdouble *lparg0=NULL; -#ifndef JNI64 - Cairo_NATIVE_ENTER(env, that, memmove___3DII_FUNC); -#else Cairo_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); -#ifndef JNI64 - Cairo_NATIVE_EXIT(env, that, memmove___3DII_FUNC); -#else Cairo_NATIVE_EXIT(env, that, memmove___3DJJ_FUNC); -#endif } #endif diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c index 3380e8170c..08adfd2b69 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2018 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2019 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -156,26 +156,10 @@ char * Cairo_nativeFunctionNames[] = { "cairo_1path_1t_1sizeof", "cairo_1rectangle_1int_1t_1sizeof", "cairo_1version", -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II", -#else "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II", -#else "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2II", -#else "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ", -#endif -#ifndef JNI64 - "memmove___3DII", -#else "memmove___3DJJ", -#endif }; #define NATIVE_FUNCTION_COUNT sizeof(Cairo_nativeFunctionNames) / sizeof(char*) int Cairo_nativeFunctionCount = NATIVE_FUNCTION_COUNT; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h index 98cdbcc2e8..ae4bcf5afe 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2018 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2019 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -166,24 +166,8 @@ typedef enum { cairo_1path_1t_1sizeof_FUNC, cairo_1rectangle_1int_1t_1sizeof_FUNC, cairo_1version_FUNC, -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_cairo_cairo_1rectangle_1int_1t_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove___3DII_FUNC, -#else memmove___3DJJ_FUNC, -#endif } Cairo_FUNCS; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c index dfde96d249..290c73b83d 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2018 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2019 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -73,7 +73,7 @@ void cachecairo_path_tFields(JNIEnv *env, jobject lpObject) if (cairo_path_tFc.cached) return; cairo_path_tFc.clazz = (*env)->GetObjectClass(env, lpObject); cairo_path_tFc.status = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "status", "I"); - cairo_path_tFc.data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "data", I_J); + cairo_path_tFc.data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "data", "J"); cairo_path_tFc.num_data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "num_data", "I"); cairo_path_tFc.cached = 1; } @@ -82,7 +82,7 @@ cairo_path_t *getcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t { if (!cairo_path_tFc.cached) cachecairo_path_tFields(env, lpObject); lpStruct->status = (*env)->GetIntField(env, lpObject, cairo_path_tFc.status); - lpStruct->data = (cairo_path_data_t *)(*env)->GetIntLongField(env, lpObject, cairo_path_tFc.data); + lpStruct->data = (cairo_path_data_t *)(*env)->GetLongField(env, lpObject, cairo_path_tFc.data); lpStruct->num_data = (*env)->GetIntField(env, lpObject, cairo_path_tFc.num_data); return lpStruct; } @@ -91,7 +91,7 @@ void setcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct { if (!cairo_path_tFc.cached) cachecairo_path_tFields(env, lpObject); (*env)->SetIntField(env, lpObject, cairo_path_tFc.status, (jint)lpStruct->status); - (*env)->SetIntLongField(env, lpObject, cairo_path_tFc.data, (jintLong)lpStruct->data); + (*env)->SetLongField(env, lpObject, cairo_path_tFc.data, (jlong)lpStruct->data); (*env)->SetIntField(env, lpObject, cairo_path_tFc.num_data, (jint)lpStruct->num_data); } #endif diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java index d9b3bec2e7..86a280dfaa 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java @@ -104,8 +104,8 @@ public static final native int CAIRO_VERSION_ENCODE(int major, int minor, int mi * @param cr cast=(cairo_t *) * @param path cast=(cairo_path_t *) */ -public static final native void _cairo_append_path(long /*int*/ cr, long /*int*/ path); -public static final void cairo_append_path(long /*int*/ cr, long /*int*/ path) { +public static final native void _cairo_append_path(long cr, long path); +public static final void cairo_append_path(long cr, long path) { lock.lock(); try { _cairo_append_path(cr, path); @@ -114,8 +114,8 @@ public static final void cairo_append_path(long /*int*/ cr, long /*int*/ path) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2); -public static final void cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) { +public static final native void _cairo_arc(long cr, double xc, double yc, double radius, double angle1, double angle2); +public static final void cairo_arc(long cr, double xc, double yc, double radius, double angle1, double angle2) { lock.lock(); try { _cairo_arc(cr, xc, yc, radius, angle1, angle2); @@ -124,8 +124,8 @@ public static final void cairo_arc(long /*int*/ cr, double xc, double yc, double } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2); -public static final void cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) { +public static final native void _cairo_arc_negative(long cr, double xc, double yc, double radius, double angle1, double angle2); +public static final void cairo_arc_negative(long cr, double xc, double yc, double radius, double angle1, double angle2) { lock.lock(); try { _cairo_arc_negative(cr, xc, yc, radius, angle1, angle2); @@ -134,8 +134,8 @@ public static final void cairo_arc_negative(long /*int*/ cr, double xc, double y } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_clip(long /*int*/ cr); -public static final void cairo_clip(long /*int*/ cr) { +public static final native void _cairo_clip(long cr); +public static final void cairo_clip(long cr) { lock.lock(); try { _cairo_clip(cr); @@ -144,8 +144,8 @@ public static final void cairo_clip(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_close_path(long /*int*/ cr); -public static final void cairo_close_path(long /*int*/ cr) { +public static final native void _cairo_close_path(long cr); +public static final void cairo_close_path(long cr) { lock.lock(); try { _cairo_close_path(cr); @@ -154,8 +154,8 @@ public static final void cairo_close_path(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_copy_page(long /*int*/ cr); -public static final void cairo_copy_page(long /*int*/ cr) { +public static final native void _cairo_copy_page(long cr); +public static final void cairo_copy_page(long cr) { lock.lock(); try { _cairo_copy_page(cr); @@ -164,8 +164,8 @@ public static final void cairo_copy_page(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native long /*int*/ _cairo_copy_path(long /*int*/ cr); -public static final long /*int*/ cairo_copy_path(long /*int*/ cr) { +public static final native long _cairo_copy_path(long cr); +public static final long cairo_copy_path(long cr) { lock.lock(); try { return _cairo_copy_path(cr); @@ -174,8 +174,8 @@ public static final long /*int*/ cairo_copy_path(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native long /*int*/ _cairo_copy_path_flat(long /*int*/ cr); -public static final long /*int*/ cairo_copy_path_flat(long /*int*/ cr) { +public static final native long _cairo_copy_path_flat(long cr); +public static final long cairo_copy_path_flat(long cr) { lock.lock(); try { return _cairo_copy_path_flat(cr); @@ -184,8 +184,8 @@ public static final long /*int*/ cairo_copy_path_flat(long /*int*/ cr) { } } /** @param target cast=(cairo_surface_t *) */ -public static final native long /*int*/ _cairo_create(long /*int*/ target); -public static final long /*int*/ cairo_create(long /*int*/ target) { +public static final native long _cairo_create(long target); +public static final long cairo_create(long target) { lock.lock(); try { return _cairo_create(target); @@ -194,8 +194,8 @@ public static final long /*int*/ cairo_create(long /*int*/ target) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3); -public static final void cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) { +public static final native void _cairo_curve_to(long cr, double x1, double y1, double x2, double y2, double x3, double y3); +public static final void cairo_curve_to(long cr, double x1, double y1, double x2, double y2, double x3, double y3) { lock.lock(); try { _cairo_curve_to(cr, x1, y1, x2, y2, x3, y3); @@ -204,8 +204,8 @@ public static final void cairo_curve_to(long /*int*/ cr, double x1, double y1, d } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_destroy(long /*int*/ cr); -public static final void cairo_destroy(long /*int*/ cr) { +public static final native void _cairo_destroy(long cr); +public static final void cairo_destroy(long cr) { lock.lock(); try { _cairo_destroy(cr); @@ -214,8 +214,8 @@ public static final void cairo_destroy(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_fill(long /*int*/ cr); -public static final void cairo_fill(long /*int*/ cr) { +public static final native void _cairo_fill(long cr); +public static final void cairo_fill(long cr) { lock.lock(); try { _cairo_fill(cr); @@ -223,8 +223,8 @@ public static final void cairo_fill(long /*int*/ cr) { lock.unlock(); } } -public static final native long /*int*/ _cairo_font_options_create(); -public static final long /*int*/ cairo_font_options_create() { +public static final native long _cairo_font_options_create(); +public static final long cairo_font_options_create() { lock.lock(); try { return _cairo_font_options_create(); @@ -233,8 +233,8 @@ public static final long /*int*/ cairo_font_options_create() { } } /** @param options cast=(cairo_font_options_t *) */ -public static final native void _cairo_font_options_destroy(long /*int*/ options); -public static final void cairo_font_options_destroy(long /*int*/ options) { +public static final native void _cairo_font_options_destroy(long options); +public static final void cairo_font_options_destroy(long options) { lock.lock(); try { _cairo_font_options_destroy(options); @@ -243,8 +243,8 @@ public static final void cairo_font_options_destroy(long /*int*/ options) { } } /** @param options cast=(cairo_font_options_t *) */ -public static final native int _cairo_font_options_get_antialias(long /*int*/ options); -public static final int cairo_font_options_get_antialias(long /*int*/ options) { +public static final native int _cairo_font_options_get_antialias(long options); +public static final int cairo_font_options_get_antialias(long options) { lock.lock(); try { return _cairo_font_options_get_antialias(options); @@ -253,8 +253,8 @@ public static final int cairo_font_options_get_antialias(long /*int*/ options) { } } /** @param options cast=(cairo_font_options_t *) */ -public static final native void _cairo_font_options_set_antialias(long /*int*/ options, int antialias); -public static final void cairo_font_options_set_antialias(long /*int*/ options, int antialias) { +public static final native void _cairo_font_options_set_antialias(long options, int antialias); +public static final void cairo_font_options_set_antialias(long options, int antialias) { lock.lock(); try { _cairo_font_options_set_antialias(options, antialias); @@ -263,8 +263,8 @@ public static final void cairo_font_options_set_antialias(long /*int*/ options, } } /** @param cr cast=(cairo_t *) */ -public static final native int _cairo_get_antialias(long /*int*/ cr); -public static final int cairo_get_antialias(long /*int*/ cr) { +public static final native int _cairo_get_antialias(long cr); +public static final int cairo_get_antialias(long cr) { lock.lock(); try { return _cairo_get_antialias(cr); @@ -273,8 +273,8 @@ public static final int cairo_get_antialias(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_get_current_point(long /*int*/ cr, double[] x, double[] y); -public static final void cairo_get_current_point(long /*int*/ cr, double[] x, double[] y) { +public static final native void _cairo_get_current_point(long cr, double[] x, double[] y); +public static final void cairo_get_current_point(long cr, double[] x, double[] y) { lock.lock(); try { _cairo_get_current_point(cr, x, y); @@ -283,8 +283,8 @@ public static final void cairo_get_current_point(long /*int*/ cr, double[] x, do } } /** @param cr cast=(cairo_t *) */ -public static final native int _cairo_get_fill_rule(long /*int*/ cr); -public static final int cairo_get_fill_rule(long /*int*/ cr) { +public static final native int _cairo_get_fill_rule(long cr); +public static final int cairo_get_fill_rule(long cr) { lock.lock(); try { return _cairo_get_fill_rule(cr); @@ -293,8 +293,8 @@ public static final int cairo_get_fill_rule(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native long /*int*/ _cairo_get_font_face(long /*int*/ cr); -public static final long /*int*/ cairo_get_font_face(long /*int*/ cr) { +public static final native long _cairo_get_font_face(long cr); +public static final long cairo_get_font_face(long cr) { lock.lock(); try { return _cairo_get_font_face(cr); @@ -306,8 +306,8 @@ public static final long /*int*/ cairo_get_font_face(long /*int*/ cr) { * @param cr cast=(cairo_t *) * @param matrix cast=(cairo_matrix_t *) */ -public static final native void _cairo_get_matrix(long /*int*/ cr, double[] matrix); -public static final void cairo_get_matrix(long /*int*/ cr, double[] matrix) { +public static final native void _cairo_get_matrix(long cr, double[] matrix); +public static final void cairo_get_matrix(long cr, double[] matrix) { lock.lock(); try { _cairo_get_matrix(cr, matrix); @@ -316,8 +316,8 @@ public static final void cairo_get_matrix(long /*int*/ cr, double[] matrix) { } } /** @param cr cast=(cairo_t *) */ -public static final native int _cairo_get_operator(long /*int*/ cr); -public static final int cairo_get_operator(long /*int*/ cr) { +public static final native int _cairo_get_operator(long cr); +public static final int cairo_get_operator(long cr) { lock.lock(); try { return _cairo_get_operator(cr); @@ -326,8 +326,8 @@ public static final int cairo_get_operator(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native long /*int*/ _cairo_get_source(long /*int*/ cr); -public static final long /*int*/ cairo_get_source(long /*int*/ cr) { +public static final native long _cairo_get_source(long cr); +public static final long cairo_get_source(long cr) { lock.lock(); try { return _cairo_get_source(cr); @@ -336,8 +336,8 @@ public static final long /*int*/ cairo_get_source(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native long /*int*/ _cairo_get_target(long /*int*/ cr); -public static final long /*int*/ cairo_get_target(long /*int*/ cr) { +public static final native long _cairo_get_target(long cr); +public static final long cairo_get_target(long cr) { lock.lock(); try { return _cairo_get_target(cr); @@ -346,8 +346,8 @@ public static final long /*int*/ cairo_get_target(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native double _cairo_get_tolerance(long /*int*/ cr); -public static final double cairo_get_tolerance(long /*int*/ cr) { +public static final native double _cairo_get_tolerance(long cr); +public static final double cairo_get_tolerance(long cr) { lock.lock(); try { return _cairo_get_tolerance(cr); @@ -356,8 +356,8 @@ public static final double cairo_get_tolerance(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_identity_matrix(long /*int*/ cr); -public static final void cairo_identity_matrix(long /*int*/ cr) { +public static final native void _cairo_identity_matrix(long cr); +public static final void cairo_identity_matrix(long cr) { lock.lock(); try { _cairo_identity_matrix(cr); @@ -365,8 +365,8 @@ public static final void cairo_identity_matrix(long /*int*/ cr) { lock.unlock(); } } -public static final native long /*int*/ _cairo_image_surface_create(int format, int width, int height); -public static final long /*int*/ cairo_image_surface_create(int format, int width, int height) { +public static final native long _cairo_image_surface_create(int format, int width, int height); +public static final long cairo_image_surface_create(int format, int width, int height) { lock.lock(); try { return _cairo_image_surface_create(format, width, height); @@ -377,8 +377,8 @@ public static final long /*int*/ cairo_image_surface_create(int format, int widt /** * @param surface cast=(cairo_surface_t *) */ -public static final native long /*int*/ _cairo_image_surface_get_data(long /*int*/ surface); -public static final long /*int*/ cairo_image_surface_get_data(long /*int*/ surface) { +public static final native long _cairo_image_surface_get_data(long surface); +public static final long cairo_image_surface_get_data(long surface) { lock.lock(); try { return _cairo_image_surface_get_data(surface); @@ -389,8 +389,8 @@ public static final long /*int*/ cairo_image_surface_get_data(long /*int*/ surfa /** * @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_image_surface_get_format(long /*int*/ surface); -public static final int cairo_image_surface_get_format(long /*int*/ surface) { +public static final native int _cairo_image_surface_get_format(long surface); +public static final int cairo_image_surface_get_format(long surface) { lock.lock(); try { return _cairo_image_surface_get_format(surface); @@ -399,8 +399,8 @@ public static final int cairo_image_surface_get_format(long /*int*/ surface) { } } /** @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_image_surface_get_height(long /*int*/ surface); -public static final int cairo_image_surface_get_height(long /*int*/ surface) { +public static final native int _cairo_image_surface_get_height(long surface); +public static final int cairo_image_surface_get_height(long surface) { lock.lock(); try { return _cairo_image_surface_get_height(surface); @@ -409,8 +409,8 @@ public static final int cairo_image_surface_get_height(long /*int*/ surface) { } } /** @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_image_surface_get_width(long /*int*/ surface); -public static final int cairo_image_surface_get_width(long /*int*/ surface) { +public static final native int _cairo_image_surface_get_width(long surface); +public static final int cairo_image_surface_get_width(long surface) { lock.lock(); try { return _cairo_image_surface_get_width(surface); @@ -421,8 +421,8 @@ public static final int cairo_image_surface_get_width(long /*int*/ surface) { /** * @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_image_surface_get_stride(long /*int*/ surface); -public static final int cairo_image_surface_get_stride(long /*int*/ surface) { +public static final native int _cairo_image_surface_get_stride(long surface); +public static final int cairo_image_surface_get_stride(long surface) { lock.lock(); try { return _cairo_image_surface_get_stride(surface); @@ -431,8 +431,8 @@ public static final int cairo_image_surface_get_stride(long /*int*/ surface) { } } /** @param cr cast=(cairo_t *) */ -public static final native int _cairo_in_fill(long /*int*/ cr, double x, double y); -public static final int cairo_in_fill(long /*int*/ cr, double x, double y) { +public static final native int _cairo_in_fill(long cr, double x, double y); +public static final int cairo_in_fill(long cr, double x, double y) { lock.lock(); try { return _cairo_in_fill(cr, x, y); @@ -441,8 +441,8 @@ public static final int cairo_in_fill(long /*int*/ cr, double x, double y) { } } /** @param cr cast=(cairo_t *) */ -public static final native int _cairo_in_stroke(long /*int*/ cr, double x, double y); -public static final int cairo_in_stroke(long /*int*/ cr, double x, double y) { +public static final native int _cairo_in_stroke(long cr, double x, double y); +public static final int cairo_in_stroke(long cr, double x, double y) { lock.lock(); try { return _cairo_in_stroke(cr, x, y); @@ -451,8 +451,8 @@ public static final int cairo_in_stroke(long /*int*/ cr, double x, double y) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_line_to(long /*int*/ cr, double x, double y); -public static final void cairo_line_to(long /*int*/ cr, double x, double y) { +public static final native void _cairo_line_to(long cr, double x, double y); +public static final void cairo_line_to(long cr, double x, double y) { lock.lock(); try { _cairo_line_to(cr, x, y); @@ -464,8 +464,8 @@ public static final void cairo_line_to(long /*int*/ cr, double x, double y) { * @param cr cast=(cairo_t *) * @param pattern cast=(cairo_pattern_t *) */ -public static final native void _cairo_mask(long /*int*/ cr, long /*int*/ pattern); -public static final void cairo_mask(long /*int*/ cr, long /*int*/ pattern) { +public static final native void _cairo_mask(long cr, long pattern); +public static final void cairo_mask(long cr, long pattern) { lock.lock(); try { _cairo_mask(cr, pattern); @@ -477,8 +477,8 @@ public static final void cairo_mask(long /*int*/ cr, long /*int*/ pattern) { * @param cr cast=(cairo_t *) * @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y); -public static final void cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y) { +public static final native void _cairo_mask_surface(long cr, long surface, double surface_x, double surface_y); +public static final void cairo_mask_surface(long cr, long surface, double surface_x, double surface_y) { lock.lock(); try { _cairo_mask_surface(cr, surface, surface_x, surface_y); @@ -601,8 +601,8 @@ public static final void cairo_matrix_translate(double[] matrix, double tx, doub } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_move_to(long /*int*/ cr, double x, double y); -public static final void cairo_move_to(long /*int*/ cr, double x, double y) { +public static final native void _cairo_move_to(long cr, double x, double y); +public static final void cairo_move_to(long cr, double x, double y) { lock.lock(); try { _cairo_move_to(cr, x, y); @@ -611,8 +611,8 @@ public static final void cairo_move_to(long /*int*/ cr, double x, double y) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_new_path(long /*int*/ cr); -public static final void cairo_new_path(long /*int*/ cr) { +public static final native void _cairo_new_path(long cr); +public static final void cairo_new_path(long cr) { lock.lock(); try { _cairo_new_path(cr); @@ -621,8 +621,8 @@ public static final void cairo_new_path(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_paint(long /*int*/ cr); -public static final void cairo_paint(long /*int*/ cr) { +public static final native void _cairo_paint(long cr); +public static final void cairo_paint(long cr) { lock.lock(); try { _cairo_paint(cr); @@ -631,8 +631,8 @@ public static final void cairo_paint(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_paint_with_alpha(long /*int*/ cr, double alpha); -public static final void cairo_paint_with_alpha(long /*int*/ cr, double alpha) { +public static final native void _cairo_paint_with_alpha(long cr, double alpha); +public static final void cairo_paint_with_alpha(long cr, double alpha) { lock.lock(); try { _cairo_paint_with_alpha(cr, alpha); @@ -641,8 +641,8 @@ public static final void cairo_paint_with_alpha(long /*int*/ cr, double alpha) { } } /** @param path cast=(cairo_path_t *) */ -public static final native void _cairo_path_destroy(long /*int*/ path); -public static final void cairo_path_destroy(long /*int*/ path) { +public static final native void _cairo_path_destroy(long path); +public static final void cairo_path_destroy(long path) { lock.lock(); try { _cairo_path_destroy(path); @@ -651,8 +651,8 @@ public static final void cairo_path_destroy(long /*int*/ path) { } } /** @param pattern cast=(cairo_pattern_t *) */ -public static final native void _cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha); -public static final void cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha) { +public static final native void _cairo_pattern_add_color_stop_rgba(long pattern, double offset, double red, double green, double blue, double alpha); +public static final void cairo_pattern_add_color_stop_rgba(long pattern, double offset, double red, double green, double blue, double alpha) { lock.lock(); try { _cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, alpha); @@ -661,8 +661,8 @@ public static final void cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, } } /** @param surface cast=(cairo_surface_t *) */ -public static final native long /*int*/ _cairo_pattern_create_for_surface(long /*int*/ surface); -public static final long /*int*/ cairo_pattern_create_for_surface(long /*int*/ surface) { +public static final native long _cairo_pattern_create_for_surface(long surface); +public static final long cairo_pattern_create_for_surface(long surface) { lock.lock(); try { return _cairo_pattern_create_for_surface(surface); @@ -670,8 +670,8 @@ public static final long /*int*/ cairo_pattern_create_for_surface(long /*int*/ s lock.unlock(); } } -public static final native long /*int*/ _cairo_pattern_create_linear(double x0, double y0, double x1, double y1); -public static final long /*int*/ cairo_pattern_create_linear(double x0, double y0, double x1, double y1) { +public static final native long _cairo_pattern_create_linear(double x0, double y0, double x1, double y1); +public static final long cairo_pattern_create_linear(double x0, double y0, double x1, double y1) { lock.lock(); try { return _cairo_pattern_create_linear(x0, y0, x1, y1); @@ -680,8 +680,8 @@ public static final long /*int*/ cairo_pattern_create_linear(double x0, double y } } /** @param pattern cast=(cairo_pattern_t *) */ -public static final native void _cairo_pattern_destroy(long /*int*/ pattern); -public static final void cairo_pattern_destroy(long /*int*/ pattern) { +public static final native void _cairo_pattern_destroy(long pattern); +public static final void cairo_pattern_destroy(long pattern) { lock.lock(); try { _cairo_pattern_destroy(pattern); @@ -690,8 +690,8 @@ public static final void cairo_pattern_destroy(long /*int*/ pattern) { } } /** @param pattern cast=(cairo_pattern_t *) */ -public static final native int _cairo_pattern_get_extend(long /*int*/ pattern); -public static final int cairo_pattern_get_extend(long /*int*/ pattern) { +public static final native int _cairo_pattern_get_extend(long pattern); +public static final int cairo_pattern_get_extend(long pattern) { lock.lock(); try { return _cairo_pattern_get_extend(pattern); @@ -700,8 +700,8 @@ public static final int cairo_pattern_get_extend(long /*int*/ pattern) { } } /** @param pattern cast=(cairo_pattern_t *) */ -public static final native void _cairo_pattern_set_extend(long /*int*/ pattern, int extend); -public static final void cairo_pattern_set_extend(long /*int*/ pattern, int extend) { +public static final native void _cairo_pattern_set_extend(long pattern, int extend); +public static final void cairo_pattern_set_extend(long pattern, int extend) { lock.lock(); try { _cairo_pattern_set_extend(pattern, extend); @@ -710,8 +710,8 @@ public static final void cairo_pattern_set_extend(long /*int*/ pattern, int exte } } /** @param pattern cast=(cairo_pattern_t *) */ -public static final native void _cairo_pattern_set_filter(long /*int*/ pattern, int filter); -public static final void cairo_pattern_set_filter(long /*int*/ pattern, int filter) { +public static final native void _cairo_pattern_set_filter(long pattern, int filter); +public static final void cairo_pattern_set_filter(long pattern, int filter) { lock.lock(); try { _cairo_pattern_set_filter(pattern, filter); @@ -723,8 +723,8 @@ public static final void cairo_pattern_set_filter(long /*int*/ pattern, int filt * @param pattern cast=(cairo_pattern_t *) * @param matrix cast=(cairo_matrix_t *) */ -public static final native void _cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix); -public static final void cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix) { +public static final native void _cairo_pattern_set_matrix(long pattern, double[] matrix); +public static final void cairo_pattern_set_matrix(long pattern, double[] matrix) { lock.lock(); try { _cairo_pattern_set_matrix(pattern, matrix); @@ -736,8 +736,8 @@ public static final void cairo_pattern_set_matrix(long /*int*/ pattern, double[] * @method flags=dynamic * @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points); -public static final void cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) { +public static final native void _cairo_pdf_surface_set_size(long surface, double width_in_points, double height_in_points); +public static final void cairo_pdf_surface_set_size(long surface, double width_in_points, double height_in_points) { lock.lock(); try { _cairo_pdf_surface_set_size(surface, width_in_points, height_in_points); @@ -748,8 +748,8 @@ public static final void cairo_pdf_surface_set_size(long /*int*/ surface, double /** * @param cairo cast=(cairo_t *) */ -public static final native void _cairo_push_group(long /*int*/ cairo); -public static final void cairo_push_group(long /*int*/ cairo) { +public static final native void _cairo_push_group(long cairo); +public static final void cairo_push_group(long cairo) { lock.lock(); try { _cairo_push_group(cairo); @@ -760,8 +760,8 @@ public static final void cairo_push_group(long /*int*/ cairo) { /** * @param cairo cast=(cairo_t *) */ -public static final native void _cairo_pop_group_to_source(long /*int*/ cairo); -public static final void cairo_pop_group_to_source(long /*int*/ cairo) { +public static final native void _cairo_pop_group_to_source(long cairo); +public static final void cairo_pop_group_to_source(long cairo) { lock.lock(); try { _cairo_pop_group_to_source(cairo); @@ -773,8 +773,8 @@ public static final void cairo_pop_group_to_source(long /*int*/ cairo) { * @method flags=dynamic * @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points); -public static final void cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) { +public static final native void _cairo_ps_surface_set_size(long surface, double width_in_points, double height_in_points); +public static final void cairo_ps_surface_set_size(long surface, double width_in_points, double height_in_points) { lock.lock(); try { _cairo_ps_surface_set_size(surface, width_in_points, height_in_points); @@ -783,8 +783,8 @@ public static final void cairo_ps_surface_set_size(long /*int*/ surface, double } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height); -public static final void cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height) { +public static final native void _cairo_rectangle(long cr, double x, double y, double width, double height); +public static final void cairo_rectangle(long cr, double x, double y, double width, double height) { lock.lock(); try { _cairo_rectangle(cr, x, y, width, height); @@ -793,8 +793,8 @@ public static final void cairo_rectangle(long /*int*/ cr, double x, double y, do } } /** @param cr cast=(cairo_t *) */ -public static final native long /*int*/ _cairo_reference(long /*int*/ cr); -public static final long /*int*/ cairo_reference(long /*int*/ cr) { +public static final native long _cairo_reference(long cr); +public static final long cairo_reference(long cr) { lock.lock(); try { return _cairo_reference(cr); @@ -803,8 +803,8 @@ public static final long /*int*/ cairo_reference(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_reset_clip(long /*int*/ cr); -public static final void cairo_reset_clip(long /*int*/ cr) { +public static final native void _cairo_reset_clip(long cr); +public static final void cairo_reset_clip(long cr) { lock.lock(); try { _cairo_reset_clip(cr); @@ -813,8 +813,8 @@ public static final void cairo_reset_clip(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_restore(long /*int*/ cr); -public static final void cairo_restore(long /*int*/ cr) { +public static final native void _cairo_restore(long cr); +public static final void cairo_restore(long cr) { lock.lock(); try { _cairo_restore(cr); @@ -823,8 +823,8 @@ public static final void cairo_restore(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_rotate(long /*int*/ cr, double angle); -public static final void cairo_rotate(long /*int*/ cr, double angle) { +public static final native void _cairo_rotate(long cr, double angle); +public static final void cairo_rotate(long cr, double angle) { lock.lock(); try { _cairo_rotate(cr, angle); @@ -833,8 +833,8 @@ public static final void cairo_rotate(long /*int*/ cr, double angle) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_save(long /*int*/ cr); -public static final void cairo_save(long /*int*/ cr) { +public static final native void _cairo_save(long cr); +public static final void cairo_save(long cr) { lock.lock(); try { _cairo_save(cr); @@ -843,8 +843,8 @@ public static final void cairo_save(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_scale(long /*int*/ cr, double sx, double sy); -public static final void cairo_scale(long /*int*/ cr, double sx, double sy) { +public static final native void _cairo_scale(long cr, double sx, double sy); +public static final void cairo_scale(long cr, double sx, double sy) { lock.lock(); try { _cairo_scale(cr, sx, sy); @@ -856,8 +856,8 @@ public static final void cairo_scale(long /*int*/ cr, double sx, double sy) { * @method flags=dynamic * @param cr cast=(cairo_surface_t *) */ -public static final native void _cairo_surface_set_device_scale(long /*int*/ cr, double sx, double sy); -public static final void cairo_surface_set_device_scale(long /*int*/ cr, double sx, double sy) { +public static final native void _cairo_surface_set_device_scale(long cr, double sx, double sy); +public static final void cairo_surface_set_device_scale(long cr, double sx, double sy) { lock.lock(); try { _cairo_surface_set_device_scale(cr, sx, sy); @@ -871,8 +871,8 @@ public static final void cairo_surface_set_device_scale(long /*int*/ cr, double * @param sx cast=(double *) * @param sy cast=(double *) */ -public static final native void _cairo_surface_get_device_scale(long /*int*/ cr, double [] sx, double [] sy); -public static final void cairo_surface_get_device_scale(long /*int*/ cr, double [] sx, double [] sy) { +public static final native void _cairo_surface_get_device_scale(long cr, double [] sx, double [] sy); +public static final void cairo_surface_get_device_scale(long cr, double [] sx, double [] sy) { lock.lock(); try { _cairo_surface_get_device_scale(cr, sx, sy); @@ -884,8 +884,8 @@ public static final void cairo_surface_get_device_scale(long /*int*/ cr, double * @param cr cast=(cairo_t *) * @param family cast=(const char *) */ -public static final native void _cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight); -public static final void cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight) { +public static final native void _cairo_select_font_face(long cr, byte[] family, int slant, int weight); +public static final void cairo_select_font_face(long cr, byte[] family, int slant, int weight) { lock.lock(); try { _cairo_select_font_face(cr, family, slant, weight); @@ -894,8 +894,8 @@ public static final void cairo_select_font_face(long /*int*/ cr, byte[] family, } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_antialias(long /*int*/ cr, int antialias); -public static final void cairo_set_antialias(long /*int*/ cr, int antialias) { +public static final native void _cairo_set_antialias(long cr, int antialias); +public static final void cairo_set_antialias(long cr, int antialias) { lock.lock(); try { _cairo_set_antialias(cr, antialias); @@ -904,8 +904,8 @@ public static final void cairo_set_antialias(long /*int*/ cr, int antialias) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset); -public static final void cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset) { +public static final native void _cairo_set_dash(long cr, double[] dashes, int ndash, double offset); +public static final void cairo_set_dash(long cr, double[] dashes, int ndash, double offset) { lock.lock(); try { _cairo_set_dash(cr, dashes, ndash, offset); @@ -914,8 +914,8 @@ public static final void cairo_set_dash(long /*int*/ cr, double[] dashes, int nd } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_fill_rule(long /*int*/ cr, int fill_rule); -public static final void cairo_set_fill_rule(long /*int*/ cr, int fill_rule) { +public static final native void _cairo_set_fill_rule(long cr, int fill_rule); +public static final void cairo_set_fill_rule(long cr, int fill_rule) { lock.lock(); try { _cairo_set_fill_rule(cr, fill_rule); @@ -927,8 +927,8 @@ public static final void cairo_set_fill_rule(long /*int*/ cr, int fill_rule) { * @param cr cast=(cairo_t *) * @param font_face cast=(cairo_font_face_t *) */ -public static final native void _cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face); -public static final void cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face) { +public static final native void _cairo_set_font_face(long cr, long font_face); +public static final void cairo_set_font_face(long cr, long font_face) { lock.lock(); try { _cairo_set_font_face(cr, font_face); @@ -937,8 +937,8 @@ public static final void cairo_set_font_face(long /*int*/ cr, long /*int*/ font_ } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_font_size(long /*int*/ cr, double size); -public static final void cairo_set_font_size(long /*int*/ cr, double size) { +public static final native void _cairo_set_font_size(long cr, double size); +public static final void cairo_set_font_size(long cr, double size) { lock.lock(); try { _cairo_set_font_size(cr, size); @@ -947,8 +947,8 @@ public static final void cairo_set_font_size(long /*int*/ cr, double size) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_line_cap(long /*int*/ cr, int line_cap); -public static final void cairo_set_line_cap(long /*int*/ cr, int line_cap) { +public static final native void _cairo_set_line_cap(long cr, int line_cap); +public static final void cairo_set_line_cap(long cr, int line_cap) { lock.lock(); try { _cairo_set_line_cap(cr, line_cap); @@ -957,8 +957,8 @@ public static final void cairo_set_line_cap(long /*int*/ cr, int line_cap) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_line_join(long /*int*/ cr, int line_join); -public static final void cairo_set_line_join(long /*int*/ cr, int line_join) { +public static final native void _cairo_set_line_join(long cr, int line_join); +public static final void cairo_set_line_join(long cr, int line_join) { lock.lock(); try { _cairo_set_line_join(cr, line_join); @@ -967,8 +967,8 @@ public static final void cairo_set_line_join(long /*int*/ cr, int line_join) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_line_width(long /*int*/ cr, double width); -public static final void cairo_set_line_width(long /*int*/ cr, double width) { +public static final native void _cairo_set_line_width(long cr, double width); +public static final void cairo_set_line_width(long cr, double width) { lock.lock(); try { _cairo_set_line_width(cr, width); @@ -980,8 +980,8 @@ public static final void cairo_set_line_width(long /*int*/ cr, double width) { * @param cr cast=(cairo_t *) * @param matrix cast=(cairo_matrix_t *) */ -public static final native void _cairo_set_matrix(long /*int*/ cr, double[] matrix); -public static final void cairo_set_matrix(long /*int*/ cr, double[] matrix) { +public static final native void _cairo_set_matrix(long cr, double[] matrix); +public static final void cairo_set_matrix(long cr, double[] matrix) { lock.lock(); try { _cairo_set_matrix(cr, matrix); @@ -990,8 +990,8 @@ public static final void cairo_set_matrix(long /*int*/ cr, double[] matrix) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_miter_limit(long /*int*/ cr, double limit); -public static final void cairo_set_miter_limit(long /*int*/ cr, double limit) { +public static final native void _cairo_set_miter_limit(long cr, double limit); +public static final void cairo_set_miter_limit(long cr, double limit) { lock.lock(); try { _cairo_set_miter_limit(cr, limit); @@ -1000,8 +1000,8 @@ public static final void cairo_set_miter_limit(long /*int*/ cr, double limit) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_operator(long /*int*/ cr, int op); -public static final void cairo_set_operator(long /*int*/ cr, int op) { +public static final native void _cairo_set_operator(long cr, int op); +public static final void cairo_set_operator(long cr, int op) { lock.lock(); try { _cairo_set_operator(cr, op); @@ -1013,8 +1013,8 @@ public static final void cairo_set_operator(long /*int*/ cr, int op) { * @param cr cast=(cairo_t *) * @param source cast=(cairo_pattern_t *) */ -public static final native void _cairo_set_source(long /*int*/ cr, long /*int*/ source); -public static final void cairo_set_source(long /*int*/ cr, long /*int*/ source) { +public static final native void _cairo_set_source(long cr, long source); +public static final void cairo_set_source(long cr, long source) { lock.lock(); try { _cairo_set_source(cr, source); @@ -1023,8 +1023,8 @@ public static final void cairo_set_source(long /*int*/ cr, long /*int*/ source) } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue); -public static final void cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue) { +public static final native void _cairo_set_source_rgb(long cr, double red, double green, double blue); +public static final void cairo_set_source_rgb(long cr, double red, double green, double blue) { lock.lock(); try { _cairo_set_source_rgb(cr, red, green, blue); @@ -1033,8 +1033,8 @@ public static final void cairo_set_source_rgb(long /*int*/ cr, double red, doubl } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha); -public static final void cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha) { +public static final native void _cairo_set_source_rgba(long cr, double red, double green, double blue, double alpha); +public static final void cairo_set_source_rgba(long cr, double red, double green, double blue, double alpha) { lock.lock(); try { _cairo_set_source_rgba(cr, red, green, blue, alpha); @@ -1046,8 +1046,8 @@ public static final void cairo_set_source_rgba(long /*int*/ cr, double red, doub * @param cr cast=(cairo_t *) * @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y); -public static final void cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y) { +public static final native void _cairo_set_source_surface(long cr, long surface, double x, double y); +public static final void cairo_set_source_surface(long cr, long surface, double x, double y) { lock.lock(); try { _cairo_set_source_surface(cr, surface, x, y); @@ -1056,8 +1056,8 @@ public static final void cairo_set_source_surface(long /*int*/ cr, long /*int*/ } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_set_tolerance(long /*int*/ cr, double tolerance); -public static final void cairo_set_tolerance(long /*int*/ cr, double tolerance) { +public static final native void _cairo_set_tolerance(long cr, double tolerance); +public static final void cairo_set_tolerance(long cr, double tolerance) { lock.lock(); try { _cairo_set_tolerance(cr, tolerance); @@ -1066,8 +1066,8 @@ public static final void cairo_set_tolerance(long /*int*/ cr, double tolerance) } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_show_page(long /*int*/ cr); -public static final void cairo_show_page(long /*int*/ cr) { +public static final native void _cairo_show_page(long cr); +public static final void cairo_show_page(long cr) { lock.lock(); try { _cairo_show_page(cr); @@ -1076,8 +1076,8 @@ public static final void cairo_show_page(long /*int*/ cr) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_stroke(long /*int*/ cr); -public static final void cairo_stroke(long /*int*/ cr) { +public static final native void _cairo_stroke(long cr); +public static final void cairo_stroke(long cr) { lock.lock(); try { _cairo_stroke(cr); @@ -1086,8 +1086,8 @@ public static final void cairo_stroke(long /*int*/ cr) { } } /** @param other cast=(cairo_surface_t *) */ -public static final native long /*int*/ _cairo_surface_create_similar(long /*int*/ other, int format, int width, int height); -public static final long /*int*/ cairo_surface_create_similar(long /*int*/ other, int format, int width, int height) { +public static final native long _cairo_surface_create_similar(long other, int format, int width, int height); +public static final long cairo_surface_create_similar(long other, int format, int width, int height) { lock.lock(); try { return _cairo_surface_create_similar(other, format, width, height); @@ -1096,8 +1096,8 @@ public static final long /*int*/ cairo_surface_create_similar(long /*int*/ other } } /** @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_surface_destroy(long /*int*/ surface); -public static final void cairo_surface_destroy(long /*int*/ surface) { +public static final native void _cairo_surface_destroy(long surface); +public static final void cairo_surface_destroy(long surface) { lock.lock(); try { _cairo_surface_destroy(surface); @@ -1106,8 +1106,8 @@ public static final void cairo_surface_destroy(long /*int*/ surface) { } } /** @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_surface_flush(long /*int*/ surface); -public static final void cairo_surface_flush(long /*int*/ surface) { +public static final native void _cairo_surface_flush(long surface); +public static final void cairo_surface_flush(long surface) { lock.lock(); try { _cairo_surface_flush(surface); @@ -1116,8 +1116,8 @@ public static final void cairo_surface_flush(long /*int*/ surface) { } } /** @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_surface_finish(long /*int*/ surface); -public static final void cairo_surface_finish(long /*int*/ surface) { +public static final native void _cairo_surface_finish(long surface); +public static final void cairo_surface_finish(long surface) { lock.lock(); try { _cairo_surface_finish(surface); @@ -1128,8 +1128,8 @@ public static final void cairo_surface_finish(long /*int*/ surface) { /** * @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_surface_get_type(long /*int*/ surface); -public static final int cairo_surface_get_type(long /*int*/ surface) { +public static final native int _cairo_surface_get_type(long surface); +public static final int cairo_surface_get_type(long surface) { lock.lock(); try { return _cairo_surface_get_type(surface); @@ -1140,8 +1140,8 @@ public static final int cairo_surface_get_type(long /*int*/ surface) { /** * @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_surface_get_content(long /*int*/ surface); -public static final int cairo_surface_get_content(long /*int*/ surface) { +public static final native int _cairo_surface_get_content(long surface); +public static final int cairo_surface_get_content(long surface) { lock.lock(); try { return _cairo_surface_get_content(surface); @@ -1153,8 +1153,8 @@ public static final int cairo_surface_get_content(long /*int*/ surface) { * @param surface cast=(cairo_surface_t *) * @param key cast=(cairo_user_data_key_t *) */ -public static final native long /*int*/ _cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key); -public static final long /*int*/ cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key) { +public static final native long _cairo_surface_get_user_data(long surface, long key); +public static final long cairo_surface_get_user_data(long surface, long key) { lock.lock(); try { return _cairo_surface_get_user_data(surface, key); @@ -1163,8 +1163,8 @@ public static final long /*int*/ cairo_surface_get_user_data(long /*int*/ surfac } } /** @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_surface_mark_dirty(long /*int*/ surface); -public static final void cairo_surface_mark_dirty(long /*int*/ surface) { +public static final native void _cairo_surface_mark_dirty(long surface); +public static final void cairo_surface_mark_dirty(long surface) { lock.lock(); try { _cairo_surface_mark_dirty(surface); @@ -1173,8 +1173,8 @@ public static final void cairo_surface_mark_dirty(long /*int*/ surface) { } } /** @param surface cast=(cairo_surface_t *) */ -public static final native void _cairo_surface_reference(long /*int*/ surface); -public static final void cairo_surface_reference(long /*int*/ surface) { +public static final native void _cairo_surface_reference(long surface); +public static final void cairo_surface_reference(long surface) { lock.lock(); try { _cairo_surface_reference(surface); @@ -1186,8 +1186,8 @@ public static final void cairo_surface_reference(long /*int*/ surface) { * @param cr cast=(cairo_t *) * @param matrix cast=(cairo_matrix_t *) */ -public static final native void _cairo_transform(long /*int*/ cr, double[] matrix); -public static final void cairo_transform(long /*int*/ cr, double[] matrix) { +public static final native void _cairo_transform(long cr, double[] matrix); +public static final void cairo_transform(long cr, double[] matrix) { lock.lock(); try { _cairo_transform(cr, matrix); @@ -1196,8 +1196,8 @@ public static final void cairo_transform(long /*int*/ cr, double[] matrix) { } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_translate(long /*int*/ cr, double tx, double ty); -public static final void cairo_translate(long /*int*/ cr, double tx, double ty) { +public static final native void _cairo_translate(long cr, double tx, double ty); +public static final void cairo_translate(long cr, double tx, double ty) { lock.lock(); try { _cairo_translate(cr, tx, ty); @@ -1206,8 +1206,8 @@ public static final void cairo_translate(long /*int*/ cr, double tx, double ty) } } /** @param cr cast=(cairo_t *) */ -public static final native void _cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy); -public static final void cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy) { +public static final native void _cairo_user_to_device_distance(long cr, double[] dx, double[] dy); +public static final void cairo_user_to_device_distance(long cr, double[] dx, double[] dy) { lock.lock(); try { _cairo_user_to_device_distance(cr, dx, dy); @@ -1222,8 +1222,8 @@ public static final native int cairo_version(); * @param drawable cast=(Drawable) * @param visual cast=(Visual *) */ -public static final native long /*int*/ _cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height); -public static final long /*int*/ cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height) { +public static final native long _cairo_xlib_surface_create(long dpy, long drawable, long visual, int width, int height); +public static final long cairo_xlib_surface_create(long dpy, long drawable, long visual, int width, int height) { lock.lock(); try { return _cairo_xlib_surface_create(dpy, drawable, visual, width, height); @@ -1235,8 +1235,8 @@ public static final long /*int*/ cairo_xlib_surface_create(long /*int*/ dpy, lon * @method flags=dynamic * @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_xlib_surface_get_height(long /*int*/ surface); -public static final int cairo_xlib_surface_get_height(long /*int*/ surface) { +public static final native int _cairo_xlib_surface_get_height(long surface); +public static final int cairo_xlib_surface_get_height(long surface) { lock.lock(); try { return _cairo_xlib_surface_get_height(surface); @@ -1248,8 +1248,8 @@ public static final int cairo_xlib_surface_get_height(long /*int*/ surface) { * @method flags=dynamic * @param surface cast=(cairo_surface_t *) */ -public static final native int _cairo_xlib_surface_get_width(long /*int*/ surface); -public static final int cairo_xlib_surface_get_width(long /*int*/ surface) { +public static final native int _cairo_xlib_surface_get_width(long surface); +public static final int cairo_xlib_surface_get_width(long surface) { lock.lock(); try { return _cairo_xlib_surface_get_width(surface); @@ -1260,8 +1260,8 @@ public static final int cairo_xlib_surface_get_width(long /*int*/ surface) { /** * @param region cast=(cairo_region_t *) */ -public static final native int _cairo_region_num_rectangles(long /*int*/ region); -public static final int cairo_region_num_rectangles(long /*int*/ region) { +public static final native int _cairo_region_num_rectangles(long region); +public static final int cairo_region_num_rectangles(long region) { lock.lock(); try { return _cairo_region_num_rectangles(region); @@ -1269,8 +1269,8 @@ public static final int cairo_region_num_rectangles(long /*int*/ region) { lock.unlock(); } } -public static final native long /*int*/ _cairo_region_create(); -public static final long /*int*/ cairo_region_create() { +public static final native long _cairo_region_create(); +public static final long cairo_region_create() { lock.lock(); try { return _cairo_region_create(); @@ -1281,8 +1281,8 @@ public static final long /*int*/ cairo_region_create() { /** * @param region cast=(cairo_region_t *) */ -public static final native long /*int*/ _cairo_region_copy(long /*int*/ region); -public static final long /*int*/ cairo_region_copy(long /*int*/ region) { +public static final native long _cairo_region_copy(long region); +public static final long cairo_region_copy(long region) { lock.lock(); try { return _cairo_region_copy(region); @@ -1293,8 +1293,8 @@ public static final long /*int*/ cairo_region_copy(long /*int*/ region) { /** * @param region cast=(cairo_region_t *) */ -public static final native boolean _cairo_region_contains_point(long /*int*/ region, int x, int y); -public static final boolean cairo_region_contains_point(long /*int*/ region, int x, int y) { +public static final native boolean _cairo_region_contains_point(long region, int x, int y); +public static final boolean cairo_region_contains_point(long region, int x, int y) { lock.lock(); try { return _cairo_region_contains_point(region, x, y); @@ -1306,8 +1306,8 @@ public static final boolean cairo_region_contains_point(long /*int*/ region, int * @param region cast=(cairo_region_t *) * @param rect cast=(cairo_rectangle_int_t *) */ -public static final native long /*int*/ _cairo_region_contains_rectangle(long /*int*/ region, cairo_rectangle_int_t rect); -public static final long /*int*/ cairo_region_contains_rectangle(long /*int*/ region, cairo_rectangle_int_t rect) { +public static final native long _cairo_region_contains_rectangle(long region, cairo_rectangle_int_t rect); +public static final long cairo_region_contains_rectangle(long region, cairo_rectangle_int_t rect) { lock.lock(); try { return _cairo_region_contains_rectangle(region, rect); @@ -1316,8 +1316,8 @@ public static final long /*int*/ cairo_region_contains_rectangle(long /*int*/ re } } /** @param region cast=(cairo_region_t *) */ -public static final native void _cairo_region_destroy(long /*int*/ region); -public static final void cairo_region_destroy(long /*int*/ region) { +public static final native void _cairo_region_destroy(long region); +public static final void cairo_region_destroy(long region) { lock.lock(); try { _cairo_region_destroy(region); @@ -1326,8 +1326,8 @@ public static final void cairo_region_destroy(long /*int*/ region) { } } /** @param region cast=(cairo_region_t *) */ -public static final native boolean _cairo_region_is_empty(long /*int*/ region); -public static final boolean cairo_region_is_empty(long /*int*/ region) { +public static final native boolean _cairo_region_is_empty(long region); +public static final boolean cairo_region_is_empty(long region) { lock.lock(); try { return _cairo_region_is_empty(region); @@ -1339,8 +1339,8 @@ public static final boolean cairo_region_is_empty(long /*int*/ region) { * @param region cast=(cairo_region_t *) * @param rectangle cast=(cairo_rectangle_int_t *),flags=no_in */ -public static final native void _cairo_region_get_extents(long /*int*/ region, cairo_rectangle_int_t rectangle); -public static final void cairo_region_get_extents(long /*int*/ region, cairo_rectangle_int_t rectangle) { +public static final native void _cairo_region_get_extents(long region, cairo_rectangle_int_t rectangle); +public static final void cairo_region_get_extents(long region, cairo_rectangle_int_t rectangle) { lock.lock(); try { _cairo_region_get_extents(region, rectangle); @@ -1352,8 +1352,8 @@ public static final void cairo_region_get_extents(long /*int*/ region, cairo_rec * @param region cast=(cairo_region_t *) * @param rectangle cast=(cairo_rectangle_int_t *) */ -public static final native void _cairo_region_get_rectangle(long /*int*/ region, int nth, long /*int*/ rectangle); -public static final void cairo_region_get_rectangle(long /*int*/ region, int nth, long /*int*/ rectangle) { +public static final native void _cairo_region_get_rectangle(long region, int nth, long rectangle); +public static final void cairo_region_get_rectangle(long region, int nth, long rectangle) { lock.lock(); try { _cairo_region_get_rectangle(region, nth, rectangle); @@ -1365,8 +1365,8 @@ public static final void cairo_region_get_rectangle(long /*int*/ region, int nth * @param source1 cast=(cairo_region_t *) * @param source2 cast=(const cairo_region_t *) */ -public static final native void _cairo_region_intersect(long /*int*/ source1, long /*int*/ source2); -public static final void cairo_region_intersect(long /*int*/ source1, long /*int*/ source2) { +public static final native void _cairo_region_intersect(long source1, long source2); +public static final void cairo_region_intersect(long source1, long source2) { lock.lock(); try { _cairo_region_intersect(source1, source2); @@ -1377,8 +1377,8 @@ public static final void cairo_region_intersect(long /*int*/ source1, long /*int /** * @param rectangle cast=(const cairo_rectangle_int_t *) */ -public static final native long /*int*/ _cairo_region_create_rectangle(cairo_rectangle_int_t rectangle); -public static final long /*int*/ cairo_region_create_rectangle(cairo_rectangle_int_t rectangle) { +public static final native long _cairo_region_create_rectangle(cairo_rectangle_int_t rectangle); +public static final long cairo_region_create_rectangle(cairo_rectangle_int_t rectangle) { lock.lock(); try { return _cairo_region_create_rectangle(rectangle); @@ -1390,8 +1390,8 @@ public static final long /*int*/ cairo_region_create_rectangle(cairo_rectangle_i * @param source1 cast=(cairo_region_t *) * @param source2 cast=(const cairo_region_t *) */ -public static final native void _cairo_region_subtract(long /*int*/ source1, long /*int*/ source2); -public static final void cairo_region_subtract(long /*int*/ source1, long /*int*/ source2) { +public static final native void _cairo_region_subtract(long source1, long source2); +public static final void cairo_region_subtract(long source1, long source2) { lock.lock(); try { _cairo_region_subtract(source1, source2); @@ -1402,8 +1402,8 @@ public static final void cairo_region_subtract(long /*int*/ source1, long /*int* /** * @param region cast=(cairo_region_t *) */ -public static final native void _cairo_region_translate(long /*int*/ region, int dx, int dy); -public static final void cairo_region_translate(long /*int*/ region, int dx, int dy) { +public static final native void _cairo_region_translate(long region, int dx, int dy); +public static final void cairo_region_translate(long region, int dx, int dy) { lock.lock(); try { _cairo_region_translate(region,dx,dy); @@ -1415,8 +1415,8 @@ public static final void cairo_region_translate(long /*int*/ region, int dx, int * @param source1 cast=(cairo_region_t *) * @param source2 cast=(const cairo_region_t *) */ -public static final native void _cairo_region_union(long /*int*/ source1, long /*int*/ source2); -public static final void cairo_region_union(long /*int*/ source1, long /*int*/ source2) { +public static final native void _cairo_region_union(long source1, long source2); +public static final void cairo_region_union(long source1, long source2) { lock.lock(); try { _cairo_region_union(source1, source2); @@ -1428,8 +1428,8 @@ public static final void cairo_region_union(long /*int*/ source1, long /*int*/ s * @param region cast=(cairo_region_t *) * @param rect cast=(cairo_rectangle_int_t *),flags=no_out */ -public static final native void _cairo_region_union_rectangle(long /*int*/ region, cairo_rectangle_int_t rect); -public static final void cairo_region_union_rectangle(long /*int*/ region, cairo_rectangle_int_t rect) { +public static final native void _cairo_region_union_rectangle(long region, cairo_rectangle_int_t rect); +public static final void cairo_region_union_rectangle(long region, cairo_rectangle_int_t rect) { lock.lock(); try { _cairo_region_union_rectangle(region, rect); @@ -1442,24 +1442,24 @@ public static final void cairo_region_union_rectangle(long /*int*/ region, cairo * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(cairo_path_t dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(cairo_path_t dest, long src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(cairo_path_data_t dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(cairo_path_data_t dest, long src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(cairo_rectangle_int_t dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(cairo_rectangle_int_t dest, long src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(double[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(double[] dest, long src, long size); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java index 29b54e6fd5..15b929c15e 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java @@ -24,7 +24,7 @@ package org.eclipse.swt.internal.cairo; public class cairo_path_t { public int status; /** @field cast=(cairo_path_data_t *) */ - public long /*int*/ data; + public long data; public int num_data; public static final int sizeof = Cairo.cairo_path_t_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c index ab782ed88b..8543a5b651 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -37,7 +37,7 @@ JNIEXPORT jint JNICALL C_NATIVE(PTR_1sizeof) #ifndef NO_free JNIEXPORT void JNICALL C_NATIVE(free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { C_NATIVE_ENTER(env, that, free_FUNC); free((void *)arg0); @@ -46,14 +46,14 @@ JNIEXPORT void JNICALL C_NATIVE(free) #endif #ifndef NO_getenv -JNIEXPORT jintLong JNICALL C_NATIVE(getenv) +JNIEXPORT jlong JNICALL C_NATIVE(getenv) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; C_NATIVE_ENTER(env, that, getenv_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)getenv((const char *)lparg0); + rc = (jlong)getenv((const char *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); C_NATIVE_EXIT(env, that, getenv_FUNC); @@ -62,253 +62,147 @@ fail: #endif #ifndef NO_malloc -JNIEXPORT jintLong JNICALL C_NATIVE(malloc) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL C_NATIVE(malloc) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; C_NATIVE_ENTER(env, that, malloc_FUNC); - rc = (jintLong)malloc(arg0); + rc = (jlong)malloc(arg0); C_NATIVE_EXIT(env, that, malloc_FUNC); return rc; } #endif -#if (!defined(NO_memmove__III) && !defined(JNI64)) || (!defined(NO_memmove__JJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__JJJ +JNIEXPORT void JNICALL C_NATIVE(memmove__JJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__III_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__JJJ_FUNC); -#endif memmove((void *)arg0, (const void *)arg1, (size_t)arg2); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__III_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__JJJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__I_3BI) && !defined(JNI64)) || (!defined(NO_memmove__J_3BJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove__J_3BJ +JNIEXPORT void JNICALL C_NATIVE(memmove__J_3BJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__I_3BI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__J_3BJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__I_3BI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__J_3BJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__I_3CI) && !defined(JNI64)) || (!defined(NO_memmove__J_3CJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__I_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__J_3CJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove__J_3CJ +JNIEXPORT void JNICALL C_NATIVE(memmove__J_3CJ) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jlong arg2) { jchar *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__I_3CI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__J_3CJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__I_3CI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__J_3CJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__I_3DI) && !defined(JNI64)) || (!defined(NO_memmove__J_3DJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__I_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__J_3DJ)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove__J_3DJ +JNIEXPORT void JNICALL C_NATIVE(memmove__J_3DJ) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jlong arg2) { jdouble *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__I_3DI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__J_3DJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__I_3DI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__J_3DJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__I_3FI) && !defined(JNI64)) || (!defined(NO_memmove__J_3FJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__I_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__J_3FJ)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove__J_3FJ +JNIEXPORT void JNICALL C_NATIVE(memmove__J_3FJ) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jlong arg2) { jfloat *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__I_3FI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__J_3FJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__I_3FI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__J_3FJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__I_3II) && !defined(JNI64)) || (!defined(NO_memmove__J_3IJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__I_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__J_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove__J_3IJ +JNIEXPORT void JNICALL C_NATIVE(memmove__J_3IJ) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jlong arg2) { jint *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__I_3II_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__J_3IJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__I_3II_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__J_3IJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__I_3JI) && !defined(JNI64)) || (!defined(NO_memmove__J_3JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__I_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__J_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove__J_3JJ +JNIEXPORT void JNICALL C_NATIVE(memmove__J_3JJ) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlong arg2) { jlong *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__I_3JI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__J_3JJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__I_3JI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__J_3JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__I_3SI) && !defined(JNI64)) || (!defined(NO_memmove__J_3SJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove__I_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove__J_3SJ)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove__J_3SJ +JNIEXPORT void JNICALL C_NATIVE(memmove__J_3SJ) + (JNIEnv *env, jclass that, jlong arg0, jshortArray arg1, jlong arg2) { jshort *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove__I_3SI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove__J_3SJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove__I_3SI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove__J_3SJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3BII) && !defined(JNI64)) || (!defined(NO_memmove___3BJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3BII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3BJJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3BJJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3BJJ) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jlong arg2) { jbyte *lparg0=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3BII_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3BJJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3BII_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3BJJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3B_3CI) && !defined(JNI64)) || (!defined(NO_memmove___3B_3CJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CI)(JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CJ)(JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3B_3CJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CJ) + (JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jlong arg2) { jbyte *lparg0=NULL; jchar *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3B_3CI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3B_3CJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; @@ -316,132 +210,77 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CJ)(JNIEnv *env, jclass that, jbyt fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3B_3CI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3B_3CJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3CII) && !defined(JNI64)) || (!defined(NO_memmove___3CJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3CII)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3CJJ)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3CJJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3CJJ) + (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jlong arg2) { jchar *lparg0=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3CII_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3CJJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3CII_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3CJJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3DII) && !defined(JNI64)) || (!defined(NO_memmove___3DJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3DII)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3DJJ)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3DJJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3DJJ) + (JNIEnv *env, jclass that, jdoubleArray arg0, jlong arg1, jlong arg2) { jdouble *lparg0=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3DII_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3DII_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3DJJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3FII) && !defined(JNI64)) || (!defined(NO_memmove___3FJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3FII)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3FJJ)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3FJJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3FJJ) + (JNIEnv *env, jclass that, jfloatArray arg0, jlong arg1, jlong arg2) { jfloat *lparg0=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3FII_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3FJJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3FII_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3FJJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3III) && !defined(JNI64)) || (!defined(NO_memmove___3IJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3III)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3IJJ)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3IJJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3IJJ) + (JNIEnv *env, jclass that, jintArray arg0, jlong arg1, jlong arg2) { jint *lparg0=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3III_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3IJJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3III_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3IJJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3I_3BI) && !defined(JNI64)) || (!defined(NO_memmove___3I_3BJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BI)(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BJ)(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3I_3BJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BJ) + (JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jlong arg2) { jint *lparg0=NULL; jbyte *lparg1=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3I_3BI_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3I_3BJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; @@ -449,73 +288,47 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BJ)(JNIEnv *env, jclass that, jint fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3I_3BI_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3I_3BJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3JII) && !defined(JNI64)) || (!defined(NO_memmove___3JJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3JII)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3JJJ)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3JJJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3JJJ) + (JNIEnv *env, jclass that, jlongArray arg0, jlong arg1, jlong arg2) { jlong *lparg0=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3JII_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3JJJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3JII_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3JJJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove___3SII) && !defined(JNI64)) || (!defined(NO_memmove___3SJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL C_NATIVE(memmove___3SII)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL C_NATIVE(memmove___3SJJ)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove___3SJJ +JNIEXPORT void JNICALL C_NATIVE(memmove___3SJJ) + (JNIEnv *env, jclass that, jshortArray arg0, jlong arg1, jlong arg2) { jshort *lparg0=NULL; -#ifndef JNI64 - C_NATIVE_ENTER(env, that, memmove___3SII_FUNC); -#else C_NATIVE_ENTER(env, that, memmove___3SJJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - C_NATIVE_EXIT(env, that, memmove___3SII_FUNC); -#else C_NATIVE_EXIT(env, that, memmove___3SJJ_FUNC); -#endif } #endif #ifndef NO_memset -JNIEXPORT jintLong JNICALL C_NATIVE(memset) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) +JNIEXPORT jlong JNICALL C_NATIVE(memset) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; C_NATIVE_ENTER(env, that, memset_FUNC); - rc = (jintLong)memset((void *)arg0, arg1, (size_t)arg2); + rc = (jlong)memset((void *)arg0, arg1, (size_t)arg2); C_NATIVE_EXIT(env, that, memset_FUNC); return rc; } @@ -542,7 +355,7 @@ fail: #ifndef NO_strlen JNIEXPORT jint JNICALL C_NATIVE(strlen) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; C_NATIVE_ENTER(env, that, strlen_FUNC); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c index f7c4632529..ed4d3f9b60 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -25,91 +25,23 @@ char * C_nativeFunctionNames[] = { "free", "getenv", "malloc", -#ifndef JNI64 - "memmove__III", -#else "memmove__JJJ", -#endif -#ifndef JNI64 - "memmove__I_3BI", -#else "memmove__J_3BJ", -#endif -#ifndef JNI64 - "memmove__I_3CI", -#else "memmove__J_3CJ", -#endif -#ifndef JNI64 - "memmove__I_3DI", -#else "memmove__J_3DJ", -#endif -#ifndef JNI64 - "memmove__I_3FI", -#else "memmove__J_3FJ", -#endif -#ifndef JNI64 - "memmove__I_3II", -#else "memmove__J_3IJ", -#endif -#ifndef JNI64 - "memmove__I_3JI", -#else "memmove__J_3JJ", -#endif -#ifndef JNI64 - "memmove__I_3SI", -#else "memmove__J_3SJ", -#endif -#ifndef JNI64 - "memmove___3BII", -#else "memmove___3BJJ", -#endif -#ifndef JNI64 - "memmove___3B_3CI", -#else "memmove___3B_3CJ", -#endif -#ifndef JNI64 - "memmove___3CII", -#else "memmove___3CJJ", -#endif -#ifndef JNI64 - "memmove___3DII", -#else "memmove___3DJJ", -#endif -#ifndef JNI64 - "memmove___3FII", -#else "memmove___3FJJ", -#endif -#ifndef JNI64 - "memmove___3III", -#else "memmove___3IJJ", -#endif -#ifndef JNI64 - "memmove___3I_3BI", -#else "memmove___3I_3BJ", -#endif -#ifndef JNI64 - "memmove___3JII", -#else "memmove___3JJJ", -#endif -#ifndef JNI64 - "memmove___3SII", -#else "memmove___3SJJ", -#endif "memset", "setenv", "strlen", diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h index 434d081a00..311a251d92 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -35,91 +35,23 @@ typedef enum { free_FUNC, getenv_FUNC, malloc_FUNC, -#ifndef JNI64 - memmove__III_FUNC, -#else memmove__JJJ_FUNC, -#endif -#ifndef JNI64 - memmove__I_3BI_FUNC, -#else memmove__J_3BJ_FUNC, -#endif -#ifndef JNI64 - memmove__I_3CI_FUNC, -#else memmove__J_3CJ_FUNC, -#endif -#ifndef JNI64 - memmove__I_3DI_FUNC, -#else memmove__J_3DJ_FUNC, -#endif -#ifndef JNI64 - memmove__I_3FI_FUNC, -#else memmove__J_3FJ_FUNC, -#endif -#ifndef JNI64 - memmove__I_3II_FUNC, -#else memmove__J_3IJ_FUNC, -#endif -#ifndef JNI64 - memmove__I_3JI_FUNC, -#else memmove__J_3JJ_FUNC, -#endif -#ifndef JNI64 - memmove__I_3SI_FUNC, -#else memmove__J_3SJ_FUNC, -#endif -#ifndef JNI64 - memmove___3BII_FUNC, -#else memmove___3BJJ_FUNC, -#endif -#ifndef JNI64 - memmove___3B_3CI_FUNC, -#else memmove___3B_3CJ_FUNC, -#endif -#ifndef JNI64 - memmove___3CII_FUNC, -#else memmove___3CJJ_FUNC, -#endif -#ifndef JNI64 - memmove___3DII_FUNC, -#else memmove___3DJJ_FUNC, -#endif -#ifndef JNI64 - memmove___3FII_FUNC, -#else memmove___3FJJ_FUNC, -#endif -#ifndef JNI64 - memmove___3III_FUNC, -#else memmove___3IJJ_FUNC, -#endif -#ifndef JNI64 - memmove___3I_3BI_FUNC, -#else memmove___3I_3BJ_FUNC, -#endif -#ifndef JNI64 - memmove___3JII_FUNC, -#else memmove___3JJJ_FUNC, -#endif -#ifndef JNI64 - memmove___3SII_FUNC, -#else memmove___3SJJ_FUNC, -#endif memset_FUNC, setenv_FUNC, strlen_FUNC, diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java index c2a45cf15f..1abd49ca47 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java @@ -22,123 +22,123 @@ public class C extends Platform { public static final int PTR_SIZEOF = PTR_sizeof (); /** @param ptr cast=(void *) */ -public static final native void free (long /*int*/ ptr); +public static final native void free (long ptr); /** @param env cast=(const char *) */ -public static final native long /*int*/ getenv (byte[] env); +public static final native long getenv (byte[] env); /** * @param env cast=(const char *) * @param value cast=(const char *) */ public static final native int setenv (byte[] env, byte[] value, int overwrite); -public static final native long /*int*/ malloc (long /*int*/ size); +public static final native long malloc (long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, byte[] src, long /*int*/ size); +public static final native void memmove (long dest, byte[] src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, char[] src, long /*int*/ size); +public static final native void memmove (long dest, char[] src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, double[] src, long /*int*/ size); +public static final native void memmove (long dest, double[] src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, float[] src, long /*int*/ size); +public static final native void memmove (long dest, float[] src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, int[] src, long /*int*/ size); +public static final native void memmove (long dest, int[] src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, long[] src, long /*int*/ size); +public static final native void memmove (long dest, long[] src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, short[] src, long /*int*/ size); +public static final native void memmove (long dest, short[] src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *),flags=no_out critical * @param size cast=(size_t) */ -public static final native void memmove (byte[] dest, char[] src, long /*int*/ size); +public static final native void memmove (byte[] dest, char[] src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (byte[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (byte[] dest, long src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (long dest, long src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (char[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (char[] dest, long src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (double[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (double[] dest, long src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (float[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (float[] dest, long src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (int[] dest, byte[] src, long /*int*/ size); +public static final native void memmove (int[] dest, byte[] src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (short[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (short[] dest, long src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (int[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (int[] dest, long src, long size); /** * @param dest cast=(void *),flags=no_in critical * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove (long[] dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove (long[] dest, long src, long size); /** * @param buffer cast=(void *),flags=critical * @param num cast=(size_t) */ -public static final native long /*int*/ memset (long /*int*/ buffer, int c, long /*int*/ num); +public static final native long memset (long buffer, int c, long num); public static final native int PTR_sizeof (); /** @param s cast=(char *) */ -public static final native int strlen (long /*int*/ s); +public static final native int strlen (long s); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java index f693119985..182ced004e 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java @@ -15,9 +15,9 @@ package org.eclipse.swt.internal; /** @jniclass flags=no_gen */ public class LONG { - public long /*int*/ value; + public long value; - public LONG (long /*int*/ value) { + public LONG (long value) { this.value = value; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c index 9385081133..d3e6c3dbe4 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -25,108 +25,108 @@ #endif #ifndef NO_ATK_1TYPE_1ACTION -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1ACTION) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1ACTION) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1ACTION_FUNC); - rc = (jintLong)ATK_TYPE_ACTION; + rc = (jlong)ATK_TYPE_ACTION; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1ACTION_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1COMPONENT -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1COMPONENT) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1COMPONENT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1COMPONENT_FUNC); - rc = (jintLong)ATK_TYPE_COMPONENT; + rc = (jlong)ATK_TYPE_COMPONENT; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1COMPONENT_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1EDITABLE_1TEXT -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1EDITABLE_1TEXT) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1EDITABLE_1TEXT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1EDITABLE_1TEXT_FUNC); - rc = (jintLong)ATK_TYPE_EDITABLE_TEXT; + rc = (jlong)ATK_TYPE_EDITABLE_TEXT; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1EDITABLE_1TEXT_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1HYPERTEXT -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1HYPERTEXT) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1HYPERTEXT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1HYPERTEXT_FUNC); - rc = (jintLong)ATK_TYPE_HYPERTEXT; + rc = (jlong)ATK_TYPE_HYPERTEXT; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1HYPERTEXT_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1OBJECT_1FACTORY -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1OBJECT_1FACTORY) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1OBJECT_1FACTORY) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1OBJECT_1FACTORY_FUNC); - rc = (jintLong)ATK_TYPE_OBJECT_FACTORY; + rc = (jlong)ATK_TYPE_OBJECT_FACTORY; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1OBJECT_1FACTORY_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1SELECTION -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1SELECTION) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1SELECTION) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1SELECTION_FUNC); - rc = (jintLong)ATK_TYPE_SELECTION; + rc = (jlong)ATK_TYPE_SELECTION; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1SELECTION_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1TABLE -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1TABLE) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1TABLE) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1TABLE_FUNC); - rc = (jintLong)ATK_TYPE_TABLE; + rc = (jlong)ATK_TYPE_TABLE; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1TABLE_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1TEXT -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1TEXT) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1TEXT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1TEXT_FUNC); - rc = (jintLong)ATK_TYPE_TEXT; + rc = (jlong)ATK_TYPE_TEXT; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1TEXT_FUNC); return rc; } #endif #ifndef NO_ATK_1TYPE_1VALUE -JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1VALUE) +JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1VALUE) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1VALUE_FUNC); - rc = (jintLong)ATK_TYPE_VALUE; + rc = (jlong)ATK_TYPE_VALUE; ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1VALUE_FUNC); return rc; } @@ -169,108 +169,108 @@ JNIEXPORT jint JNICALL ATK_NATIVE(AtkTextRectangle_1sizeof) #endif #ifndef NO__1ATK_1ACTION_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1ACTION_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_ACTION_GET_IFACE(arg0); + rc = (jlong)ATK_ACTION_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1ACTION_1GET_1IFACE_FUNC); return rc; } #endif #ifndef NO__1ATK_1COMPONENT_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1COMPONENT_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_COMPONENT_GET_IFACE(arg0); + rc = (jlong)ATK_COMPONENT_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1COMPONENT_1GET_1IFACE_FUNC); return rc; } #endif #ifndef NO__1ATK_1EDITABLE_1TEXT_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1EDITABLE_1TEXT_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1EDITABLE_1TEXT_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1EDITABLE_1TEXT_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_EDITABLE_TEXT_GET_IFACE(arg0); + rc = (jlong)ATK_EDITABLE_TEXT_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1EDITABLE_1TEXT_1GET_1IFACE_FUNC); return rc; } #endif #ifndef NO__1ATK_1HYPERTEXT_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1HYPERTEXT_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1HYPERTEXT_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1HYPERTEXT_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_HYPERTEXT_GET_IFACE(arg0); + rc = (jlong)ATK_HYPERTEXT_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1HYPERTEXT_1GET_1IFACE_FUNC); return rc; } #endif #ifndef NO__1ATK_1OBJECT_1FACTORY_1CLASS -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC); - rc = (jintLong)ATK_OBJECT_FACTORY_CLASS(arg0); + rc = (jlong)ATK_OBJECT_FACTORY_CLASS(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC); return rc; } #endif #ifndef NO__1ATK_1SELECTION_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1SELECTION_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_SELECTION_GET_IFACE(arg0); + rc = (jlong)ATK_SELECTION_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1SELECTION_1GET_1IFACE_FUNC); return rc; } #endif #ifndef NO__1ATK_1TABLE_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1TABLE_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1TABLE_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1TABLE_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_TABLE_GET_IFACE(arg0); + rc = (jlong)ATK_TABLE_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1TABLE_1GET_1IFACE_FUNC); return rc; } #endif #ifndef NO__1ATK_1TEXT_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1TEXT_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_TEXT_GET_IFACE(arg0); + rc = (jlong)ATK_TEXT_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1TEXT_1GET_1IFACE_FUNC); return rc; } #endif #ifndef NO__1ATK_1VALUE_1GET_1IFACE -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1VALUE_1GET_1IFACE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1VALUE_1GET_1IFACE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1ATK_1VALUE_1GET_1IFACE_FUNC); - rc = (jintLong)ATK_VALUE_GET_IFACE(arg0); + rc = (jlong)ATK_VALUE_GET_IFACE(arg0); ATK_NATIVE_EXIT(env, that, _1ATK_1VALUE_1GET_1IFACE_FUNC); return rc; } @@ -278,7 +278,7 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1VALUE_1GET_1IFACE) #ifndef NO__1atk_1object_1add_1relationship JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1object_1add_1relationship) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { jboolean rc = 0; ATK_NATIVE_ENTER(env, that, _1atk_1object_1add_1relationship_FUNC); @@ -290,7 +290,7 @@ JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1object_1add_1relationship) #ifndef NO__1atk_1object_1notify_1state_1change JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1notify_1state_1change) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2) { ATK_NATIVE_ENTER(env, that, _1atk_1object_1notify_1state_1change_FUNC); atk_object_notify_state_change((AtkObject *)arg0, arg1, arg2); @@ -300,7 +300,7 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1notify_1state_1change) #ifndef NO__1atk_1object_1remove_1relationship JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1object_1remove_1relationship) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { jboolean rc = 0; ATK_NATIVE_ENTER(env, that, _1atk_1object_1remove_1relationship_FUNC); @@ -312,7 +312,7 @@ JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1object_1remove_1relationship) #ifndef NO__1atk_1state_1set_1add_1state JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; ATK_NATIVE_ENTER(env, that, _1atk_1state_1set_1add_1state_FUNC); @@ -323,643 +323,335 @@ JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state) #endif #ifndef NO__1atk_1text_1attribute_1get_1name -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1name) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1name) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1atk_1text_1attribute_1get_1name_FUNC); - rc = (jintLong)atk_text_attribute_get_name(arg0); + rc = (jlong)atk_text_attribute_get_name(arg0); ATK_NATIVE_EXIT(env, that, _1atk_1text_1attribute_1get_1name_FUNC); return rc; } #endif #ifndef NO__1atk_1text_1attribute_1get_1value -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1value) +JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1value) (JNIEnv *env, jclass that, jint arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1atk_1text_1attribute_1get_1value_FUNC); - rc = (jintLong)atk_text_attribute_get_value(arg0, arg1); + rc = (jlong)atk_text_attribute_get_value(arg0, arg1); ATK_NATIVE_EXIT(env, that, _1atk_1text_1attribute_1get_1value_FUNC); return rc; } #endif -#if (!defined(NO__1call__II) && !defined(JNI64)) || (!defined(NO__1call__JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO__1call__JJ +JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, _1call__II_FUNC); -#else + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1call__JJ_FUNC); -#endif - rc = (jintLong)((jintLong (*)())arg0)(arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, _1call__II_FUNC); -#else + rc = (jlong)((jlong (*)())arg0)(arg1); ATK_NATIVE_EXIT(env, that, _1call__JJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1call__III) && !defined(JNI64)) || (!defined(NO__1call__JJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO__1call__JJJ +JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, _1call__III_FUNC); -#else + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1call__JJJ_FUNC); -#endif - rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, _1call__III_FUNC); -#else + rc = (jlong)((jlong (*)())arg0)(arg1, arg2); ATK_NATIVE_EXIT(env, that, _1call__JJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1call__IIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) -#else -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) -#endif +#ifndef NO__1call__JJJJ +JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3) { - jintLong rc = 0; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, _1call__IIII_FUNC); -#else + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1call__JJJJ_FUNC); -#endif - rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, _1call__IIII_FUNC); -#else + rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3); ATK_NATIVE_EXIT(env, that, _1call__JJJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1call__IIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5) -#else -JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5) -#endif +#ifndef NO__1call__JJJJJJ +JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJJJJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5) { - jintLong rc = 0; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, _1call__IIIIII_FUNC); -#else + jlong rc = 0; ATK_NATIVE_ENTER(env, that, _1call__JJJJJJ_FUNC); -#endif - rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, _1call__IIIIII_FUNC); -#else + rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5); ATK_NATIVE_EXIT(env, that, _1call__JJJJJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC); -#endif if (arg1) getAtkActionIfaceFields(env, arg1, (AtkActionIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { AtkAttribute _arg1, *lparg1=NULL; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); -#endif if (arg1) if ((lparg1 = getAtkAttributeFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC); -#endif if (arg1) getAtkComponentIfaceFields(env, arg1, (AtkComponentIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC); -#endif if (arg1) getAtkEditableTextIfaceFields(env, arg1, (AtkEditableTextIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC); -#endif if (arg1) getAtkHypertextIfaceFields(env, arg1, (AtkHypertextIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC); -#endif if (arg1) getAtkObjectClassFields(env, arg1, (AtkObjectClass *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC); -#endif if (arg1) getAtkSelectionIfaceFields(env, arg1, (AtkSelectionIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); -#endif if (arg1) getAtkTableIfaceFields(env, arg1, (AtkTableIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC); -#endif if (arg1) getAtkTextIfaceFields(env, arg1, (AtkTextIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { AtkTextRange _arg1, *lparg1=NULL; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); -#endif if (arg1) if ((lparg1 = getAtkTextRangeFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { AtkTextRectangle _arg1, *lparg1=NULL; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); -#endif if (arg1) if ((lparg1 = getAtkTextRectangleFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); -#endif if (arg1) getAtkValueIfaceFields(env, arg1, (AtkValueIface *)arg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC); -#endif if (arg0) setAtkActionIfaceFields(env, arg0, (AtkActionIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { AtkAttribute _arg0, *lparg0=NULL; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI_FUNC); -#endif if (arg0) if ((lparg0 = getAtkAttributeFields(env, arg0, &_arg0)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setAtkAttributeFields(env, arg0, lparg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC); -#endif if (arg0) setAtkComponentIfaceFields(env, arg0, (AtkComponentIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J_FUNC); -#endif if (arg0) setAtkEditableTextIfaceFields(env, arg0, (AtkEditableTextIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC); -#endif if (arg0) setAtkHypertextIfaceFields(env, arg0, (AtkHypertextIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC); -#endif if (arg0) setAtkObjectClassFields(env, arg0, (AtkObjectClass *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC); -#endif if (arg0) setAtkSelectionIfaceFields(env, arg0, (AtkSelectionIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J_FUNC); -#endif if (arg0) setAtkTableIfaceFields(env, arg0, (AtkTableIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC); -#endif if (arg0) setAtkTextIfaceFields(env, arg0, (AtkTextIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { AtkTextRange _arg0, *lparg0=NULL; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI_FUNC); -#endif if (arg0) if ((lparg0 = getAtkTextRangeFields(env, arg0, &_arg0)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setAtkTextRangeFields(env, arg0, lparg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { AtkTextRectangle _arg0, *lparg0=NULL; -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI_FUNC); -#endif if (arg0) if ((lparg0 = getAtkTextRectangleFields(env, arg0, &_arg0)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setAtkTextRectangleFields(env, arg0, lparg0); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I_FUNC); -#else ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J_FUNC); -#endif if (arg0) setAtkValueIfaceFields(env, arg0, (AtkValueIface *)arg1); -#ifndef JNI64 - ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I_FUNC); -#else ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J_FUNC); -#endif } #endif diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c index 61f2fa373f..3ebce3a6d4 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -49,146 +49,34 @@ char * ATK_nativeFunctionNames[] = { "_1atk_1state_1set_1add_1state", "_1atk_1text_1attribute_1get_1name", "_1atk_1text_1attribute_1get_1value", -#ifndef JNI64 - "_1call__II", -#else "_1call__JJ", -#endif -#ifndef JNI64 - "_1call__III", -#else "_1call__JJJ", -#endif -#ifndef JNI64 - "_1call__IIII", -#else "_1call__JJJJ", -#endif -#ifndef JNI64 - "_1call__IIIIII", -#else "_1call__JJJJJJ", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2", -#else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I", -#else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J", -#endif }; #define NATIVE_FUNCTION_COUNT sizeof(ATK_nativeFunctionNames) / sizeof(char*) int ATK_nativeFunctionCount = NATIVE_FUNCTION_COUNT; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h index cd9187eb4e..5d5f089d90 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -59,144 +59,32 @@ typedef enum { _1atk_1state_1set_1add_1state_FUNC, _1atk_1text_1attribute_1get_1name_FUNC, _1atk_1text_1attribute_1get_1value_FUNC, -#ifndef JNI64 - _1call__II_FUNC, -#else _1call__JJ_FUNC, -#endif -#ifndef JNI64 - _1call__III_FUNC, -#else _1call__JJJ_FUNC, -#endif -#ifndef JNI64 - _1call__IIII_FUNC, -#else _1call__JJJJ_FUNC, -#endif -#ifndef JNI64 - _1call__IIIIII_FUNC, -#else _1call__JJJJJJ_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J_FUNC, -#endif } ATK_FUNCS; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c index 6c04b64cdc..a0b6c2cb19 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -32,36 +32,36 @@ void cacheAtkActionIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkActionIfaceFc.cached) return; AtkActionIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkActionIfaceFc.do_action = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "do_action", I_J); - AtkActionIfaceFc.get_n_actions = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_n_actions", I_J); - AtkActionIfaceFc.get_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_description", I_J); - AtkActionIfaceFc.get_name = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_name", I_J); - AtkActionIfaceFc.get_keybinding = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_keybinding", I_J); - AtkActionIfaceFc.set_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "set_description", I_J); + AtkActionIfaceFc.do_action = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "do_action", "J"); + AtkActionIfaceFc.get_n_actions = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_n_actions", "J"); + AtkActionIfaceFc.get_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_description", "J"); + AtkActionIfaceFc.get_name = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_name", "J"); + AtkActionIfaceFc.get_keybinding = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_keybinding", "J"); + AtkActionIfaceFc.set_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "set_description", "J"); AtkActionIfaceFc.cached = 1; } AtkActionIface *getAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct) { if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject); - lpStruct->do_action = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.do_action); - lpStruct->get_n_actions = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_n_actions); - lpStruct->get_description = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_description); - lpStruct->get_name = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_name); - lpStruct->get_keybinding = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding); - lpStruct->set_description = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.set_description); + lpStruct->do_action = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.do_action); + lpStruct->get_n_actions = (gint (*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_n_actions); + lpStruct->get_description = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_description); + lpStruct->get_name = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_name); + lpStruct->get_keybinding = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_keybinding); + lpStruct->set_description = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.set_description); return lpStruct; } void setAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct) { if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.do_action, (jintLong)lpStruct->do_action); - (*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_n_actions, (jintLong)lpStruct->get_n_actions); - (*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_description, (jintLong)lpStruct->get_description); - (*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_name, (jintLong)lpStruct->get_name); - (*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding, (jintLong)lpStruct->get_keybinding); - (*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.set_description, (jintLong)lpStruct->set_description); + (*env)->SetLongField(env, lpObject, AtkActionIfaceFc.do_action, (jlong)lpStruct->do_action); + (*env)->SetLongField(env, lpObject, AtkActionIfaceFc.get_n_actions, (jlong)lpStruct->get_n_actions); + (*env)->SetLongField(env, lpObject, AtkActionIfaceFc.get_description, (jlong)lpStruct->get_description); + (*env)->SetLongField(env, lpObject, AtkActionIfaceFc.get_name, (jlong)lpStruct->get_name); + (*env)->SetLongField(env, lpObject, AtkActionIfaceFc.get_keybinding, (jlong)lpStruct->get_keybinding); + (*env)->SetLongField(env, lpObject, AtkActionIfaceFc.set_description, (jlong)lpStruct->set_description); } #endif @@ -78,24 +78,24 @@ void cacheAtkAttributeFields(JNIEnv *env, jobject lpObject) { if (AtkAttributeFc.cached) return; AtkAttributeFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkAttributeFc.name = (*env)->GetFieldID(env, AtkAttributeFc.clazz, "name", I_J); - AtkAttributeFc.value = (*env)->GetFieldID(env, AtkAttributeFc.clazz, "value", I_J); + AtkAttributeFc.name = (*env)->GetFieldID(env, AtkAttributeFc.clazz, "name", "J"); + AtkAttributeFc.value = (*env)->GetFieldID(env, AtkAttributeFc.clazz, "value", "J"); AtkAttributeFc.cached = 1; } AtkAttribute *getAtkAttributeFields(JNIEnv *env, jobject lpObject, AtkAttribute *lpStruct) { if (!AtkAttributeFc.cached) cacheAtkAttributeFields(env, lpObject); - lpStruct->name = (char *)(*env)->GetIntLongField(env, lpObject, AtkAttributeFc.name); - lpStruct->value = (char *)(*env)->GetIntLongField(env, lpObject, AtkAttributeFc.value); + lpStruct->name = (char *)(*env)->GetLongField(env, lpObject, AtkAttributeFc.name); + lpStruct->value = (char *)(*env)->GetLongField(env, lpObject, AtkAttributeFc.value); return lpStruct; } void setAtkAttributeFields(JNIEnv *env, jobject lpObject, AtkAttribute *lpStruct) { if (!AtkAttributeFc.cached) cacheAtkAttributeFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkAttributeFc.name, (jintLong)lpStruct->name); - (*env)->SetIntLongField(env, lpObject, AtkAttributeFc.value, (jintLong)lpStruct->value); + (*env)->SetLongField(env, lpObject, AtkAttributeFc.name, (jlong)lpStruct->name); + (*env)->SetLongField(env, lpObject, AtkAttributeFc.value, (jlong)lpStruct->value); } #endif @@ -112,57 +112,57 @@ void cacheAtkComponentIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkComponentIfaceFc.cached) return; AtkComponentIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkComponentIfaceFc.add_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "add_focus_handler", I_J); - AtkComponentIfaceFc.contains = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "contains", I_J); - AtkComponentIfaceFc.ref_accessible_at_point = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "ref_accessible_at_point", I_J); - AtkComponentIfaceFc.get_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_extents", I_J); - AtkComponentIfaceFc.get_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_position", I_J); - AtkComponentIfaceFc.get_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_size", I_J); - AtkComponentIfaceFc.grab_focus = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "grab_focus", I_J); - AtkComponentIfaceFc.remove_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "remove_focus_handler", I_J); - AtkComponentIfaceFc.set_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_extents", I_J); - AtkComponentIfaceFc.set_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_position", I_J); - AtkComponentIfaceFc.set_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_size", I_J); - AtkComponentIfaceFc.get_layer = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_layer", I_J); - AtkComponentIfaceFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_mdi_zorder", I_J); + AtkComponentIfaceFc.add_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "add_focus_handler", "J"); + AtkComponentIfaceFc.contains = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "contains", "J"); + AtkComponentIfaceFc.ref_accessible_at_point = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "ref_accessible_at_point", "J"); + AtkComponentIfaceFc.get_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_extents", "J"); + AtkComponentIfaceFc.get_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_position", "J"); + AtkComponentIfaceFc.get_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_size", "J"); + AtkComponentIfaceFc.grab_focus = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "grab_focus", "J"); + AtkComponentIfaceFc.remove_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "remove_focus_handler", "J"); + AtkComponentIfaceFc.set_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_extents", "J"); + AtkComponentIfaceFc.set_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_position", "J"); + AtkComponentIfaceFc.set_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_size", "J"); + AtkComponentIfaceFc.get_layer = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_layer", "J"); + AtkComponentIfaceFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_mdi_zorder", "J"); AtkComponentIfaceFc.cached = 1; } AtkComponentIface *getAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct) { if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject); - lpStruct->add_focus_handler = (guint (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler); - lpStruct->contains = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.contains); - lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point); - lpStruct->get_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_extents); - lpStruct->get_position = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_position); - lpStruct->get_size = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_size); - lpStruct->grab_focus = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.grab_focus); - lpStruct->remove_focus_handler = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler); - lpStruct->set_extents = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_extents); - lpStruct->set_position = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_position); - lpStruct->set_size = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_size); - lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_layer); - lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder); + lpStruct->add_focus_handler = (guint (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler); + lpStruct->contains = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.contains); + lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point); + lpStruct->get_extents = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_extents); + lpStruct->get_position = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_position); + lpStruct->get_size = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_size); + lpStruct->grab_focus = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.grab_focus); + lpStruct->remove_focus_handler = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler); + lpStruct->set_extents = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_extents); + lpStruct->set_position = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_position); + lpStruct->set_size = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_size); + lpStruct->get_layer = (AtkLayer (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_layer); + lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder); return lpStruct; } void setAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct) { if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler, (jintLong)lpStruct->add_focus_handler); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.contains, (jintLong)lpStruct->contains); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point, (jintLong)lpStruct->ref_accessible_at_point); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_extents, (jintLong)lpStruct->get_extents); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_position, (jintLong)lpStruct->get_position); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_size, (jintLong)lpStruct->get_size); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.grab_focus, (jintLong)lpStruct->grab_focus); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler, (jintLong)lpStruct->remove_focus_handler); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.set_extents, (jintLong)lpStruct->set_extents); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.set_position, (jintLong)lpStruct->set_position); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.set_size, (jintLong)lpStruct->set_size); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_layer, (jintLong)lpStruct->get_layer); - (*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder, (jintLong)lpStruct->get_mdi_zorder); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler, (jlong)lpStruct->add_focus_handler); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.contains, (jlong)lpStruct->contains); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point, (jlong)lpStruct->ref_accessible_at_point); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.get_extents, (jlong)lpStruct->get_extents); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.get_position, (jlong)lpStruct->get_position); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.get_size, (jlong)lpStruct->get_size); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.grab_focus, (jlong)lpStruct->grab_focus); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler, (jlong)lpStruct->remove_focus_handler); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.set_extents, (jlong)lpStruct->set_extents); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.set_position, (jlong)lpStruct->set_position); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.set_size, (jlong)lpStruct->set_size); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.get_layer, (jlong)lpStruct->get_layer); + (*env)->SetLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder, (jlong)lpStruct->get_mdi_zorder); } #endif @@ -179,39 +179,39 @@ void cacheAtkEditableTextIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkEditableTextIfaceFc.cached) return; AtkEditableTextIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkEditableTextIfaceFc.set_run_attributes = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "set_run_attributes", I_J); - AtkEditableTextIfaceFc.set_text_contents = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "set_text_contents", I_J); - AtkEditableTextIfaceFc.insert_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "insert_text", I_J); - AtkEditableTextIfaceFc.copy_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "copy_text", I_J); - AtkEditableTextIfaceFc.cut_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "cut_text", I_J); - AtkEditableTextIfaceFc.delete_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "delete_text", I_J); - AtkEditableTextIfaceFc.paste_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "paste_text", I_J); + AtkEditableTextIfaceFc.set_run_attributes = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "set_run_attributes", "J"); + AtkEditableTextIfaceFc.set_text_contents = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "set_text_contents", "J"); + AtkEditableTextIfaceFc.insert_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "insert_text", "J"); + AtkEditableTextIfaceFc.copy_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "copy_text", "J"); + AtkEditableTextIfaceFc.cut_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "cut_text", "J"); + AtkEditableTextIfaceFc.delete_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "delete_text", "J"); + AtkEditableTextIfaceFc.paste_text = (*env)->GetFieldID(env, AtkEditableTextIfaceFc.clazz, "paste_text", "J"); AtkEditableTextIfaceFc.cached = 1; } AtkEditableTextIface *getAtkEditableTextIfaceFields(JNIEnv *env, jobject lpObject, AtkEditableTextIface *lpStruct) { if (!AtkEditableTextIfaceFc.cached) cacheAtkEditableTextIfaceFields(env, lpObject); - lpStruct->set_run_attributes = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes); - lpStruct->set_text_contents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents); - lpStruct->insert_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text); - lpStruct->copy_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text); - lpStruct->cut_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text); - lpStruct->delete_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text); - lpStruct->paste_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text); + lpStruct->set_run_attributes = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes); + lpStruct->set_text_contents = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents); + lpStruct->insert_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text); + lpStruct->copy_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text); + lpStruct->cut_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text); + lpStruct->delete_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text); + lpStruct->paste_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text); return lpStruct; } void setAtkEditableTextIfaceFields(JNIEnv *env, jobject lpObject, AtkEditableTextIface *lpStruct) { if (!AtkEditableTextIfaceFc.cached) cacheAtkEditableTextIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes, (jintLong)lpStruct->set_run_attributes); - (*env)->SetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents, (jintLong)lpStruct->set_text_contents); - (*env)->SetIntLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text, (jintLong)lpStruct->insert_text); - (*env)->SetIntLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text, (jintLong)lpStruct->copy_text); - (*env)->SetIntLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text, (jintLong)lpStruct->cut_text); - (*env)->SetIntLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text, (jintLong)lpStruct->delete_text); - (*env)->SetIntLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text, (jintLong)lpStruct->paste_text); + (*env)->SetLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes, (jlong)lpStruct->set_run_attributes); + (*env)->SetLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents, (jlong)lpStruct->set_text_contents); + (*env)->SetLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text, (jlong)lpStruct->insert_text); + (*env)->SetLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text, (jlong)lpStruct->copy_text); + (*env)->SetLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text, (jlong)lpStruct->cut_text); + (*env)->SetLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text, (jlong)lpStruct->delete_text); + (*env)->SetLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text, (jlong)lpStruct->paste_text); } #endif @@ -228,27 +228,27 @@ void cacheAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkHypertextIfaceFc.cached) return; AtkHypertextIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkHypertextIfaceFc.get_link = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link", I_J); - AtkHypertextIfaceFc.get_n_links = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_n_links", I_J); - AtkHypertextIfaceFc.get_link_index = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link_index", I_J); + AtkHypertextIfaceFc.get_link = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link", "J"); + AtkHypertextIfaceFc.get_n_links = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_n_links", "J"); + AtkHypertextIfaceFc.get_link_index = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link_index", "J"); AtkHypertextIfaceFc.cached = 1; } AtkHypertextIface *getAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct) { if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject); - lpStruct->get_link = (AtkHyperlink *(*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link); - lpStruct->get_n_links = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links); - lpStruct->get_link_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index); + lpStruct->get_link = (AtkHyperlink *(*)())(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_link); + lpStruct->get_n_links = (gint (*)())(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links); + lpStruct->get_link_index = (gint (*)())(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index); return lpStruct; } void setAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct) { if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link, (jintLong)lpStruct->get_link); - (*env)->SetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links, (jintLong)lpStruct->get_n_links); - (*env)->SetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index, (jintLong)lpStruct->get_link_index); + (*env)->SetLongField(env, lpObject, AtkHypertextIfaceFc.get_link, (jlong)lpStruct->get_link); + (*env)->SetLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links, (jlong)lpStruct->get_n_links); + (*env)->SetLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index, (jlong)lpStruct->get_link_index); } #endif @@ -265,90 +265,90 @@ void cacheAtkObjectClassFields(JNIEnv *env, jobject lpObject) { if (AtkObjectClassFc.cached) return; AtkObjectClassFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkObjectClassFc.get_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_name", I_J); - AtkObjectClassFc.get_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_description", I_J); - AtkObjectClassFc.get_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_parent", I_J); - AtkObjectClassFc.get_n_children = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_n_children", I_J); - AtkObjectClassFc.ref_child = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_child", I_J); - AtkObjectClassFc.get_index_in_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_index_in_parent", I_J); - AtkObjectClassFc.ref_relation_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_relation_set", I_J); - AtkObjectClassFc.get_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_role", I_J); - AtkObjectClassFc.get_layer = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_layer", I_J); - AtkObjectClassFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_mdi_zorder", I_J); - AtkObjectClassFc.ref_state_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_state_set", I_J); - AtkObjectClassFc.set_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_name", I_J); - AtkObjectClassFc.set_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_description", I_J); - AtkObjectClassFc.set_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_parent", I_J); - AtkObjectClassFc.set_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_role", I_J); - AtkObjectClassFc.connect_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "connect_property_change_handler", I_J); - AtkObjectClassFc.remove_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "remove_property_change_handler", I_J); - AtkObjectClassFc.initialize = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "initialize", I_J); - AtkObjectClassFc.children_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "children_changed", I_J); - AtkObjectClassFc.focus_event = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "focus_event", I_J); - AtkObjectClassFc.property_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "property_change", I_J); - AtkObjectClassFc.state_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "state_change", I_J); - AtkObjectClassFc.visible_data_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "visible_data_changed", I_J); - AtkObjectClassFc.get_attributes = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_attributes", I_J); + AtkObjectClassFc.get_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_name", "J"); + AtkObjectClassFc.get_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_description", "J"); + AtkObjectClassFc.get_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_parent", "J"); + AtkObjectClassFc.get_n_children = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_n_children", "J"); + AtkObjectClassFc.ref_child = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_child", "J"); + AtkObjectClassFc.get_index_in_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_index_in_parent", "J"); + AtkObjectClassFc.ref_relation_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_relation_set", "J"); + AtkObjectClassFc.get_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_role", "J"); + AtkObjectClassFc.get_layer = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_layer", "J"); + AtkObjectClassFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_mdi_zorder", "J"); + AtkObjectClassFc.ref_state_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_state_set", "J"); + AtkObjectClassFc.set_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_name", "J"); + AtkObjectClassFc.set_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_description", "J"); + AtkObjectClassFc.set_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_parent", "J"); + AtkObjectClassFc.set_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_role", "J"); + AtkObjectClassFc.connect_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "connect_property_change_handler", "J"); + AtkObjectClassFc.remove_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "remove_property_change_handler", "J"); + AtkObjectClassFc.initialize = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "initialize", "J"); + AtkObjectClassFc.children_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "children_changed", "J"); + AtkObjectClassFc.focus_event = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "focus_event", "J"); + AtkObjectClassFc.property_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "property_change", "J"); + AtkObjectClassFc.state_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "state_change", "J"); + AtkObjectClassFc.visible_data_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "visible_data_changed", "J"); + AtkObjectClassFc.get_attributes = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_attributes", "J"); AtkObjectClassFc.cached = 1; } AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct) { if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject); - lpStruct->get_name = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_name); - lpStruct->get_description = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_description); - lpStruct->get_parent = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_parent); - lpStruct->get_n_children = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_n_children); - lpStruct->ref_child = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_child); - lpStruct->get_index_in_parent = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent); - lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_relation_set); - lpStruct->get_role = (AtkRole (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_role); - lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_layer); - lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder); - lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_state_set); - lpStruct->set_name = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_name); - lpStruct->set_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_description); - lpStruct->set_parent = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_parent); - lpStruct->set_role = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_role); - lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler); - lpStruct->remove_property_change_handler = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler); - lpStruct->initialize = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.initialize); - lpStruct->children_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.children_changed); - lpStruct->focus_event = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.focus_event); - lpStruct->property_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.property_change); - lpStruct->state_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.state_change); - lpStruct->visible_data_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.visible_data_changed); - lpStruct->SWT_AtkObjectClass_get_attributes = (SWT_AtkObjectClass_get_attributes_cast)(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_attributes); + lpStruct->get_name = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_name); + lpStruct->get_description = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_description); + lpStruct->get_parent = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_parent); + lpStruct->get_n_children = (gint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_n_children); + lpStruct->ref_child = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_child); + lpStruct->get_index_in_parent = (gint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent); + lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_relation_set); + lpStruct->get_role = (AtkRole (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_role); + lpStruct->get_layer = (AtkLayer (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_layer); + lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder); + lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_state_set); + lpStruct->set_name = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_name); + lpStruct->set_description = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_description); + lpStruct->set_parent = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_parent); + lpStruct->set_role = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_role); + lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler); + lpStruct->remove_property_change_handler = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler); + lpStruct->initialize = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.initialize); + lpStruct->children_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.children_changed); + lpStruct->focus_event = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.focus_event); + lpStruct->property_change = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.property_change); + lpStruct->state_change = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.state_change); + lpStruct->visible_data_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.visible_data_changed); + lpStruct->SWT_AtkObjectClass_get_attributes = (SWT_AtkObjectClass_get_attributes_cast)(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_attributes); return lpStruct; } void setAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct) { if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_name, (jintLong)lpStruct->get_name); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_description, (jintLong)lpStruct->get_description); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_parent, (jintLong)lpStruct->get_parent); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_n_children, (jintLong)lpStruct->get_n_children); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.ref_child, (jintLong)lpStruct->ref_child); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent, (jintLong)lpStruct->get_index_in_parent); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.ref_relation_set, (jintLong)lpStruct->ref_relation_set); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_role, (jintLong)lpStruct->get_role); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_layer, (jintLong)lpStruct->get_layer); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder, (jintLong)lpStruct->get_mdi_zorder); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.ref_state_set, (jintLong)lpStruct->ref_state_set); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_name, (jintLong)lpStruct->set_name); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_description, (jintLong)lpStruct->set_description); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_parent, (jintLong)lpStruct->set_parent); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_role, (jintLong)lpStruct->set_role); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler, (jintLong)lpStruct->connect_property_change_handler); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler, (jintLong)lpStruct->remove_property_change_handler); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.initialize, (jintLong)lpStruct->initialize); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.children_changed, (jintLong)lpStruct->children_changed); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.focus_event, (jintLong)lpStruct->focus_event); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.property_change, (jintLong)lpStruct->property_change); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.state_change, (jintLong)lpStruct->state_change); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.visible_data_changed, (jintLong)lpStruct->visible_data_changed); - (*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_attributes, (jintLong)lpStruct->SWT_AtkObjectClass_get_attributes); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_name, (jlong)lpStruct->get_name); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_description, (jlong)lpStruct->get_description); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_parent, (jlong)lpStruct->get_parent); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_n_children, (jlong)lpStruct->get_n_children); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.ref_child, (jlong)lpStruct->ref_child); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent, (jlong)lpStruct->get_index_in_parent); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.ref_relation_set, (jlong)lpStruct->ref_relation_set); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_role, (jlong)lpStruct->get_role); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_layer, (jlong)lpStruct->get_layer); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder, (jlong)lpStruct->get_mdi_zorder); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.ref_state_set, (jlong)lpStruct->ref_state_set); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.set_name, (jlong)lpStruct->set_name); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.set_description, (jlong)lpStruct->set_description); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.set_parent, (jlong)lpStruct->set_parent); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.set_role, (jlong)lpStruct->set_role); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler, (jlong)lpStruct->connect_property_change_handler); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler, (jlong)lpStruct->remove_property_change_handler); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.initialize, (jlong)lpStruct->initialize); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.children_changed, (jlong)lpStruct->children_changed); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.focus_event, (jlong)lpStruct->focus_event); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.property_change, (jlong)lpStruct->property_change); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.state_change, (jlong)lpStruct->state_change); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.visible_data_changed, (jlong)lpStruct->visible_data_changed); + (*env)->SetLongField(env, lpObject, AtkObjectClassFc.get_attributes, (jlong)lpStruct->SWT_AtkObjectClass_get_attributes); } #endif @@ -365,42 +365,42 @@ void cacheAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkSelectionIfaceFc.cached) return; AtkSelectionIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkSelectionIfaceFc.add_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "add_selection", I_J); - AtkSelectionIfaceFc.clear_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "clear_selection", I_J); - AtkSelectionIfaceFc.ref_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "ref_selection", I_J); - AtkSelectionIfaceFc.get_selection_count = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "get_selection_count", I_J); - AtkSelectionIfaceFc.is_child_selected = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "is_child_selected", I_J); - AtkSelectionIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "remove_selection", I_J); - AtkSelectionIfaceFc.select_all_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "select_all_selection", I_J); - AtkSelectionIfaceFc.selection_changed = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "selection_changed", I_J); + AtkSelectionIfaceFc.add_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "add_selection", "J"); + AtkSelectionIfaceFc.clear_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "clear_selection", "J"); + AtkSelectionIfaceFc.ref_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "ref_selection", "J"); + AtkSelectionIfaceFc.get_selection_count = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "get_selection_count", "J"); + AtkSelectionIfaceFc.is_child_selected = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "is_child_selected", "J"); + AtkSelectionIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "remove_selection", "J"); + AtkSelectionIfaceFc.select_all_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "select_all_selection", "J"); + AtkSelectionIfaceFc.selection_changed = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "selection_changed", "J"); AtkSelectionIfaceFc.cached = 1; } AtkSelectionIface *getAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct) { if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject); - lpStruct->add_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.add_selection); - lpStruct->clear_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection); - lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection); - lpStruct->get_selection_count = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count); - lpStruct->is_child_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected); - lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection); - lpStruct->select_all_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection); - lpStruct->selection_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed); + lpStruct->add_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.add_selection); + lpStruct->clear_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection); + lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection); + lpStruct->get_selection_count = (gint (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count); + lpStruct->is_child_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected); + lpStruct->remove_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection); + lpStruct->select_all_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection); + lpStruct->selection_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed); return lpStruct; } void setAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct) { if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.add_selection, (jintLong)lpStruct->add_selection); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection, (jintLong)lpStruct->clear_selection); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection, (jintLong)lpStruct->ref_selection); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count, (jintLong)lpStruct->get_selection_count); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected, (jintLong)lpStruct->is_child_selected); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection, (jintLong)lpStruct->remove_selection); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection, (jintLong)lpStruct->select_all_selection); - (*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed, (jintLong)lpStruct->selection_changed); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.add_selection, (jlong)lpStruct->add_selection); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection, (jlong)lpStruct->clear_selection); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection, (jlong)lpStruct->ref_selection); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count, (jlong)lpStruct->get_selection_count); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected, (jlong)lpStruct->is_child_selected); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection, (jlong)lpStruct->remove_selection); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection, (jlong)lpStruct->select_all_selection); + (*env)->SetLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed, (jlong)lpStruct->selection_changed); } #endif @@ -417,126 +417,126 @@ void cacheAtkTableIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkTableIfaceFc.cached) return; AtkTableIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkTableIfaceFc.ref_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "ref_at", I_J); - AtkTableIfaceFc.get_index_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_index_at", I_J); - AtkTableIfaceFc.get_column_at_index = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_at_index", I_J); - AtkTableIfaceFc.get_row_at_index = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_at_index", I_J); - AtkTableIfaceFc.get_n_columns = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_n_columns", I_J); - AtkTableIfaceFc.get_n_rows = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_n_rows", I_J); - AtkTableIfaceFc.get_column_extent_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_extent_at", I_J); - AtkTableIfaceFc.get_row_extent_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_extent_at", I_J); - AtkTableIfaceFc.get_caption = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_caption", I_J); - AtkTableIfaceFc.get_column_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_description", I_J); - AtkTableIfaceFc.get_column_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_header", I_J); - AtkTableIfaceFc.get_row_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_description", I_J); - AtkTableIfaceFc.get_row_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_header", I_J); - AtkTableIfaceFc.get_summary = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_summary", I_J); - AtkTableIfaceFc.set_caption = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_caption", I_J); - AtkTableIfaceFc.set_column_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_column_description", I_J); - AtkTableIfaceFc.set_column_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_column_header", I_J); - AtkTableIfaceFc.set_row_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_row_description", I_J); - AtkTableIfaceFc.set_row_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_row_header", I_J); - AtkTableIfaceFc.set_summary = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_summary", I_J); - AtkTableIfaceFc.get_selected_columns = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_selected_columns", I_J); - AtkTableIfaceFc.get_selected_rows = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_selected_rows", I_J); - AtkTableIfaceFc.is_column_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_column_selected", I_J); - AtkTableIfaceFc.is_row_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_row_selected", I_J); - AtkTableIfaceFc.is_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_selected", I_J); - AtkTableIfaceFc.add_row_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "add_row_selection", I_J); - AtkTableIfaceFc.remove_row_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "remove_row_selection", I_J); - AtkTableIfaceFc.add_column_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "add_column_selection", I_J); - AtkTableIfaceFc.remove_column_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "remove_column_selection", I_J); - AtkTableIfaceFc.row_inserted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_inserted", I_J); - AtkTableIfaceFc.column_inserted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_inserted", I_J); - AtkTableIfaceFc.row_deleted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_deleted", I_J); - AtkTableIfaceFc.column_deleted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_deleted", I_J); - AtkTableIfaceFc.row_reordered = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_reordered", I_J); - AtkTableIfaceFc.column_reordered = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_reordered", I_J); - AtkTableIfaceFc.model_changed = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "model_changed", I_J); + AtkTableIfaceFc.ref_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "ref_at", "J"); + AtkTableIfaceFc.get_index_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_index_at", "J"); + AtkTableIfaceFc.get_column_at_index = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_at_index", "J"); + AtkTableIfaceFc.get_row_at_index = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_at_index", "J"); + AtkTableIfaceFc.get_n_columns = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_n_columns", "J"); + AtkTableIfaceFc.get_n_rows = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_n_rows", "J"); + AtkTableIfaceFc.get_column_extent_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_extent_at", "J"); + AtkTableIfaceFc.get_row_extent_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_extent_at", "J"); + AtkTableIfaceFc.get_caption = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_caption", "J"); + AtkTableIfaceFc.get_column_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_description", "J"); + AtkTableIfaceFc.get_column_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_header", "J"); + AtkTableIfaceFc.get_row_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_description", "J"); + AtkTableIfaceFc.get_row_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_header", "J"); + AtkTableIfaceFc.get_summary = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_summary", "J"); + AtkTableIfaceFc.set_caption = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_caption", "J"); + AtkTableIfaceFc.set_column_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_column_description", "J"); + AtkTableIfaceFc.set_column_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_column_header", "J"); + AtkTableIfaceFc.set_row_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_row_description", "J"); + AtkTableIfaceFc.set_row_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_row_header", "J"); + AtkTableIfaceFc.set_summary = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_summary", "J"); + AtkTableIfaceFc.get_selected_columns = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_selected_columns", "J"); + AtkTableIfaceFc.get_selected_rows = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_selected_rows", "J"); + AtkTableIfaceFc.is_column_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_column_selected", "J"); + AtkTableIfaceFc.is_row_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_row_selected", "J"); + AtkTableIfaceFc.is_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_selected", "J"); + AtkTableIfaceFc.add_row_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "add_row_selection", "J"); + AtkTableIfaceFc.remove_row_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "remove_row_selection", "J"); + AtkTableIfaceFc.add_column_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "add_column_selection", "J"); + AtkTableIfaceFc.remove_column_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "remove_column_selection", "J"); + AtkTableIfaceFc.row_inserted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_inserted", "J"); + AtkTableIfaceFc.column_inserted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_inserted", "J"); + AtkTableIfaceFc.row_deleted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_deleted", "J"); + AtkTableIfaceFc.column_deleted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_deleted", "J"); + AtkTableIfaceFc.row_reordered = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_reordered", "J"); + AtkTableIfaceFc.column_reordered = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_reordered", "J"); + AtkTableIfaceFc.model_changed = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "model_changed", "J"); AtkTableIfaceFc.cached = 1; } AtkTableIface *getAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct) { if (!AtkTableIfaceFc.cached) cacheAtkTableIfaceFields(env, lpObject); - lpStruct->ref_at = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.ref_at); - lpStruct->get_index_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_index_at); - lpStruct->get_column_at_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index); - lpStruct->get_row_at_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index); - lpStruct->get_n_columns = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_columns); - lpStruct->get_n_rows = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_rows); - lpStruct->get_column_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at); - lpStruct->get_row_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at); - lpStruct->get_caption = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_caption); - lpStruct->get_column_description = (const gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description); - lpStruct->get_column_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_header); - lpStruct->get_row_description = (const gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description); - lpStruct->get_row_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_header); - lpStruct->get_summary = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_summary); - lpStruct->set_caption = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_caption); - lpStruct->set_column_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_description); - lpStruct->set_column_header = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_header); - lpStruct->set_row_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_description); - lpStruct->set_row_header = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_header); - lpStruct->set_summary = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_summary); - lpStruct->get_selected_columns = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns); - lpStruct->get_selected_rows = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows); - lpStruct->is_column_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_column_selected); - lpStruct->is_row_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_row_selected); - lpStruct->is_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_selected); - lpStruct->add_row_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_row_selection); - lpStruct->remove_row_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection); - lpStruct->add_column_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_column_selection); - lpStruct->remove_column_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection); - lpStruct->row_inserted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_inserted); - lpStruct->column_inserted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_inserted); - lpStruct->row_deleted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_deleted); - lpStruct->column_deleted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_deleted); - lpStruct->row_reordered = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_reordered); - lpStruct->column_reordered = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_reordered); - lpStruct->model_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.model_changed); + lpStruct->ref_at = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.ref_at); + lpStruct->get_index_at = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_index_at); + lpStruct->get_column_at_index = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index); + lpStruct->get_row_at_index = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index); + lpStruct->get_n_columns = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_n_columns); + lpStruct->get_n_rows = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_n_rows); + lpStruct->get_column_extent_at = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at); + lpStruct->get_row_extent_at = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at); + lpStruct->get_caption = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_caption); + lpStruct->get_column_description = (const gchar* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_description); + lpStruct->get_column_header = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_header); + lpStruct->get_row_description = (const gchar* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_description); + lpStruct->get_row_header = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_header); + lpStruct->get_summary = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_summary); + lpStruct->set_caption = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_caption); + lpStruct->set_column_description = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_column_description); + lpStruct->set_column_header = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_column_header); + lpStruct->set_row_description = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_row_description); + lpStruct->set_row_header = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_row_header); + lpStruct->set_summary = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_summary); + lpStruct->get_selected_columns = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns); + lpStruct->get_selected_rows = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows); + lpStruct->is_column_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_column_selected); + lpStruct->is_row_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_row_selected); + lpStruct->is_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_selected); + lpStruct->add_row_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.add_row_selection); + lpStruct->remove_row_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection); + lpStruct->add_column_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.add_column_selection); + lpStruct->remove_column_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection); + lpStruct->row_inserted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_inserted); + lpStruct->column_inserted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_inserted); + lpStruct->row_deleted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_deleted); + lpStruct->column_deleted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_deleted); + lpStruct->row_reordered = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_reordered); + lpStruct->column_reordered = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_reordered); + lpStruct->model_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.model_changed); return lpStruct; } void setAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct) { if (!AtkTableIfaceFc.cached) cacheAtkTableIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.ref_at, (jintLong)lpStruct->ref_at); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_index_at, (jintLong)lpStruct->get_index_at); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index, (jintLong)lpStruct->get_column_at_index); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index, (jintLong)lpStruct->get_row_at_index); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_columns, (jintLong)lpStruct->get_n_columns); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_rows, (jintLong)lpStruct->get_n_rows); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at, (jintLong)lpStruct->get_column_extent_at); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at, (jintLong)lpStruct->get_row_extent_at); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_caption, (jintLong)lpStruct->get_caption); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description, (jintLong)lpStruct->get_column_description); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_header, (jintLong)lpStruct->get_column_header); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description, (jintLong)lpStruct->get_row_description); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_header, (jintLong)lpStruct->get_row_header); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_summary, (jintLong)lpStruct->get_summary); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_caption, (jintLong)lpStruct->set_caption); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_description, (jintLong)lpStruct->set_column_description); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_header, (jintLong)lpStruct->set_column_header); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_description, (jintLong)lpStruct->set_row_description); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_header, (jintLong)lpStruct->set_row_header); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_summary, (jintLong)lpStruct->set_summary); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns, (jintLong)lpStruct->get_selected_columns); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows, (jintLong)lpStruct->get_selected_rows); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.is_column_selected, (jintLong)lpStruct->is_column_selected); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.is_row_selected, (jintLong)lpStruct->is_row_selected); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.is_selected, (jintLong)lpStruct->is_selected); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.add_row_selection, (jintLong)lpStruct->add_row_selection); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection, (jintLong)lpStruct->remove_row_selection); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.add_column_selection, (jintLong)lpStruct->add_column_selection); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection, (jintLong)lpStruct->remove_column_selection); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.row_inserted, (jintLong)lpStruct->row_inserted); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.column_inserted, (jintLong)lpStruct->column_inserted); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.row_deleted, (jintLong)lpStruct->row_deleted); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.column_deleted, (jintLong)lpStruct->column_deleted); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.row_reordered, (jintLong)lpStruct->row_reordered); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.column_reordered, (jintLong)lpStruct->column_reordered); - (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.model_changed, (jintLong)lpStruct->model_changed); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.ref_at, (jlong)lpStruct->ref_at); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_index_at, (jlong)lpStruct->get_index_at); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index, (jlong)lpStruct->get_column_at_index); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index, (jlong)lpStruct->get_row_at_index); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_n_columns, (jlong)lpStruct->get_n_columns); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_n_rows, (jlong)lpStruct->get_n_rows); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at, (jlong)lpStruct->get_column_extent_at); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at, (jlong)lpStruct->get_row_extent_at); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_caption, (jlong)lpStruct->get_caption); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_column_description, (jlong)lpStruct->get_column_description); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_column_header, (jlong)lpStruct->get_column_header); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_row_description, (jlong)lpStruct->get_row_description); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_row_header, (jlong)lpStruct->get_row_header); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_summary, (jlong)lpStruct->get_summary); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.set_caption, (jlong)lpStruct->set_caption); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.set_column_description, (jlong)lpStruct->set_column_description); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.set_column_header, (jlong)lpStruct->set_column_header); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.set_row_description, (jlong)lpStruct->set_row_description); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.set_row_header, (jlong)lpStruct->set_row_header); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.set_summary, (jlong)lpStruct->set_summary); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns, (jlong)lpStruct->get_selected_columns); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows, (jlong)lpStruct->get_selected_rows); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.is_column_selected, (jlong)lpStruct->is_column_selected); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.is_row_selected, (jlong)lpStruct->is_row_selected); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.is_selected, (jlong)lpStruct->is_selected); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.add_row_selection, (jlong)lpStruct->add_row_selection); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection, (jlong)lpStruct->remove_row_selection); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.add_column_selection, (jlong)lpStruct->add_column_selection); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection, (jlong)lpStruct->remove_column_selection); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.row_inserted, (jlong)lpStruct->row_inserted); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.column_inserted, (jlong)lpStruct->column_inserted); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.row_deleted, (jlong)lpStruct->row_deleted); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.column_deleted, (jlong)lpStruct->column_deleted); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.row_reordered, (jlong)lpStruct->row_reordered); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.column_reordered, (jlong)lpStruct->column_reordered); + (*env)->SetLongField(env, lpObject, AtkTableIfaceFc.model_changed, (jlong)lpStruct->model_changed); } #endif @@ -553,84 +553,84 @@ void cacheAtkTextIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkTextIfaceFc.cached) return; AtkTextIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkTextIfaceFc.get_text = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text", I_J); - AtkTextIfaceFc.get_text_after_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_after_offset", I_J); - AtkTextIfaceFc.get_text_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_at_offset", I_J); - AtkTextIfaceFc.get_character_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_at_offset", I_J); - AtkTextIfaceFc.get_text_before_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_before_offset", I_J); - AtkTextIfaceFc.get_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_caret_offset", I_J); - AtkTextIfaceFc.get_run_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_run_attributes", I_J); - AtkTextIfaceFc.get_default_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_default_attributes", I_J); - AtkTextIfaceFc.get_character_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_extents", I_J); - AtkTextIfaceFc.get_character_count = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_count", I_J); - AtkTextIfaceFc.get_offset_at_point = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_offset_at_point", I_J); - AtkTextIfaceFc.get_n_selections = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_n_selections", I_J); - AtkTextIfaceFc.get_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_selection", I_J); - AtkTextIfaceFc.add_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "add_selection", I_J); - AtkTextIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "remove_selection", I_J); - AtkTextIfaceFc.set_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_selection", I_J); - AtkTextIfaceFc.set_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_caret_offset", I_J); - AtkTextIfaceFc.text_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_changed", I_J); - AtkTextIfaceFc.text_caret_moved = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_caret_moved", I_J); - AtkTextIfaceFc.text_selection_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_selection_changed", I_J); - AtkTextIfaceFc.get_range_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_range_extents", I_J); - AtkTextIfaceFc.get_bounded_ranges = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_bounded_ranges", I_J); + AtkTextIfaceFc.get_text = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text", "J"); + AtkTextIfaceFc.get_text_after_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_after_offset", "J"); + AtkTextIfaceFc.get_text_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_at_offset", "J"); + AtkTextIfaceFc.get_character_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_at_offset", "J"); + AtkTextIfaceFc.get_text_before_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_before_offset", "J"); + AtkTextIfaceFc.get_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_caret_offset", "J"); + AtkTextIfaceFc.get_run_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_run_attributes", "J"); + AtkTextIfaceFc.get_default_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_default_attributes", "J"); + AtkTextIfaceFc.get_character_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_extents", "J"); + AtkTextIfaceFc.get_character_count = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_count", "J"); + AtkTextIfaceFc.get_offset_at_point = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_offset_at_point", "J"); + AtkTextIfaceFc.get_n_selections = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_n_selections", "J"); + AtkTextIfaceFc.get_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_selection", "J"); + AtkTextIfaceFc.add_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "add_selection", "J"); + AtkTextIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "remove_selection", "J"); + AtkTextIfaceFc.set_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_selection", "J"); + AtkTextIfaceFc.set_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_caret_offset", "J"); + AtkTextIfaceFc.text_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_changed", "J"); + AtkTextIfaceFc.text_caret_moved = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_caret_moved", "J"); + AtkTextIfaceFc.text_selection_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_selection_changed", "J"); + AtkTextIfaceFc.get_range_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_range_extents", "J"); + AtkTextIfaceFc.get_bounded_ranges = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_bounded_ranges", "J"); AtkTextIfaceFc.cached = 1; } AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct) { if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject); - lpStruct->get_text = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text); - lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset); - lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset); - lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset); - lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset); - lpStruct->get_caret_offset = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset); - lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes); - lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes); - lpStruct->get_character_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_extents); - lpStruct->get_character_count = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_count); - lpStruct->get_offset_at_point = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point); - lpStruct->get_n_selections = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_n_selections); - lpStruct->get_selection = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_selection); - lpStruct->add_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.add_selection); - lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.remove_selection); - lpStruct->set_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_selection); - lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset); - lpStruct->text_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed); - lpStruct->text_caret_moved = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved); - lpStruct->text_selection_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed); - lpStruct->get_range_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_range_extents); - lpStruct->get_bounded_ranges = (AtkTextRange** (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges); + lpStruct->get_text = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text); + lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset); + lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset); + lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset); + lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset); + lpStruct->get_caret_offset = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset); + lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes); + lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes); + lpStruct->get_character_extents = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_extents); + lpStruct->get_character_count = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_count); + lpStruct->get_offset_at_point = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point); + lpStruct->get_n_selections = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_n_selections); + lpStruct->get_selection = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_selection); + lpStruct->add_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.add_selection); + lpStruct->remove_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.remove_selection); + lpStruct->set_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.set_selection); + lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset); + lpStruct->text_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_changed); + lpStruct->text_caret_moved = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved); + lpStruct->text_selection_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed); + lpStruct->get_range_extents = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_range_extents); + lpStruct->get_bounded_ranges = (AtkTextRange** (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges); return lpStruct; } void setAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct) { if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text, (jintLong)lpStruct->get_text); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset, (jintLong)lpStruct->get_text_after_offset); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset, (jintLong)lpStruct->get_text_at_offset); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset, (jintLong)lpStruct->get_character_at_offset); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset, (jintLong)lpStruct->get_text_before_offset); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset, (jintLong)lpStruct->get_caret_offset); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes, (jintLong)lpStruct->get_run_attributes); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes, (jintLong)lpStruct->get_default_attributes); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_extents, (jintLong)lpStruct->get_character_extents); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_count, (jintLong)lpStruct->get_character_count); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point, (jintLong)lpStruct->get_offset_at_point); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_n_selections, (jintLong)lpStruct->get_n_selections); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_selection, (jintLong)lpStruct->get_selection); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.add_selection, (jintLong)lpStruct->add_selection); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.remove_selection, (jintLong)lpStruct->remove_selection); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.set_selection, (jintLong)lpStruct->set_selection); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset, (jintLong)lpStruct->set_caret_offset); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed, (jintLong)lpStruct->text_changed); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved, (jintLong)lpStruct->text_caret_moved); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed, (jintLong)lpStruct->text_selection_changed); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_range_extents, (jintLong)lpStruct->get_range_extents); - (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges, (jintLong)lpStruct->get_bounded_ranges); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_text, (jlong)lpStruct->get_text); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset, (jlong)lpStruct->get_text_after_offset); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset, (jlong)lpStruct->get_text_at_offset); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset, (jlong)lpStruct->get_character_at_offset); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset, (jlong)lpStruct->get_text_before_offset); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset, (jlong)lpStruct->get_caret_offset); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes, (jlong)lpStruct->get_run_attributes); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes, (jlong)lpStruct->get_default_attributes); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_character_extents, (jlong)lpStruct->get_character_extents); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_character_count, (jlong)lpStruct->get_character_count); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point, (jlong)lpStruct->get_offset_at_point); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_n_selections, (jlong)lpStruct->get_n_selections); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_selection, (jlong)lpStruct->get_selection); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.add_selection, (jlong)lpStruct->add_selection); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.remove_selection, (jlong)lpStruct->remove_selection); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.set_selection, (jlong)lpStruct->set_selection); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset, (jlong)lpStruct->set_caret_offset); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.text_changed, (jlong)lpStruct->text_changed); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved, (jlong)lpStruct->text_caret_moved); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed, (jlong)lpStruct->text_selection_changed); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_range_extents, (jlong)lpStruct->get_range_extents); + (*env)->SetLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges, (jlong)lpStruct->get_bounded_ranges); } #endif @@ -650,7 +650,7 @@ void cacheAtkTextRangeFields(JNIEnv *env, jobject lpObject) AtkTextRangeFc.bounds = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "bounds", "Lorg/eclipse/swt/internal/accessibility/gtk/AtkTextRectangle;"); AtkTextRangeFc.start_offset = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "start_offset", "I"); AtkTextRangeFc.end_offset = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "end_offset", "I"); - AtkTextRangeFc.content = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "content", I_J); + AtkTextRangeFc.content = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "content", "J"); AtkTextRangeFc.cached = 1; } @@ -663,7 +663,7 @@ AtkTextRange *getAtkTextRangeFields(JNIEnv *env, jobject lpObject, AtkTextRange } lpStruct->start_offset = (*env)->GetIntField(env, lpObject, AtkTextRangeFc.start_offset); lpStruct->end_offset = (*env)->GetIntField(env, lpObject, AtkTextRangeFc.end_offset); - lpStruct->content = (gchar *)(*env)->GetIntLongField(env, lpObject, AtkTextRangeFc.content); + lpStruct->content = (gchar *)(*env)->GetLongField(env, lpObject, AtkTextRangeFc.content); return lpStruct; } @@ -676,7 +676,7 @@ void setAtkTextRangeFields(JNIEnv *env, jobject lpObject, AtkTextRange *lpStruct } (*env)->SetIntField(env, lpObject, AtkTextRangeFc.start_offset, (jint)lpStruct->start_offset); (*env)->SetIntField(env, lpObject, AtkTextRangeFc.end_offset, (jint)lpStruct->end_offset); - (*env)->SetIntLongField(env, lpObject, AtkTextRangeFc.content, (jintLong)lpStruct->content); + (*env)->SetLongField(env, lpObject, AtkTextRangeFc.content, (jlong)lpStruct->content); } #endif @@ -733,30 +733,30 @@ void cacheAtkValueIfaceFields(JNIEnv *env, jobject lpObject) { if (AtkValueIfaceFc.cached) return; AtkValueIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); - AtkValueIfaceFc.get_current_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_current_value", I_J); - AtkValueIfaceFc.get_maximum_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_maximum_value", I_J); - AtkValueIfaceFc.get_minimum_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_minimum_value", I_J); - AtkValueIfaceFc.set_current_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "set_current_value", I_J); + AtkValueIfaceFc.get_current_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_current_value", "J"); + AtkValueIfaceFc.get_maximum_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_maximum_value", "J"); + AtkValueIfaceFc.get_minimum_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_minimum_value", "J"); + AtkValueIfaceFc.set_current_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "set_current_value", "J"); AtkValueIfaceFc.cached = 1; } AtkValueIface *getAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct) { if (!AtkValueIfaceFc.cached) cacheAtkValueIfaceFields(env, lpObject); - lpStruct->get_current_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_current_value); - lpStruct->get_maximum_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value); - lpStruct->get_minimum_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value); - lpStruct->set_current_value = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.set_current_value); + lpStruct->get_current_value = (void (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_current_value); + lpStruct->get_maximum_value = (void (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value); + lpStruct->get_minimum_value = (void (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value); + lpStruct->set_current_value = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.set_current_value); return lpStruct; } void setAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct) { if (!AtkValueIfaceFc.cached) cacheAtkValueIfaceFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.get_current_value, (jintLong)lpStruct->get_current_value); - (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value, (jintLong)lpStruct->get_maximum_value); - (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value, (jintLong)lpStruct->get_minimum_value); - (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.set_current_value, (jintLong)lpStruct->set_current_value); + (*env)->SetLongField(env, lpObject, AtkValueIfaceFc.get_current_value, (jlong)lpStruct->get_current_value); + (*env)->SetLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value, (jlong)lpStruct->get_maximum_value); + (*env)->SetLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value, (jlong)lpStruct->get_minimum_value); + (*env)->SetLongField(env, lpObject, AtkValueIfaceFc.set_current_value, (jlong)lpStruct->set_current_value); } #endif diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index da4b0a2dc1..4a562b022d 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -26,7 +26,7 @@ #ifndef NO_GDK_1EVENT_1TYPE JNIEXPORT jint JNICALL GDK_NATIVE(GDK_1EVENT_1TYPE) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, GDK_1EVENT_1TYPE_FUNC); @@ -37,12 +37,12 @@ JNIEXPORT jint JNICALL GDK_NATIVE(GDK_1EVENT_1TYPE) #endif #ifndef NO_GDK_1EVENT_1WINDOW -JNIEXPORT jintLong JNICALL GDK_NATIVE(GDK_1EVENT_1WINDOW) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(GDK_1EVENT_1WINDOW) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, GDK_1EVENT_1WINDOW_FUNC); - rc = (jintLong)GDK_EVENT_WINDOW((GdkEventAny *)arg0); + rc = (jlong)GDK_EVENT_WINDOW((GdkEventAny *)arg0); GDK_NATIVE_EXIT(env, that, GDK_1EVENT_1WINDOW_FUNC); return rc; } @@ -50,7 +50,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(GDK_1EVENT_1WINDOW) #ifndef NO_GDK_1IS_1X11_1DISPLAY JNIEXPORT jboolean JNICALL GDK_NATIVE(GDK_1IS_1X11_1DISPLAY) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GDK_NATIVE_ENTER(env, that, GDK_1IS_1X11_1DISPLAY_FUNC); @@ -217,44 +217,44 @@ JNIEXPORT jint JNICALL GDK_NATIVE(GdkWindowAttr_1sizeof) #endif #ifndef NO__1GDK_1TYPE_1PIXBUF -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1GDK_1TYPE_1PIXBUF) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1GDK_1TYPE_1PIXBUF) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1GDK_1TYPE_1PIXBUF_FUNC); - rc = (jintLong)GDK_TYPE_PIXBUF; + rc = (jlong)GDK_TYPE_PIXBUF; GDK_NATIVE_EXIT(env, that, _1GDK_1TYPE_1PIXBUF_FUNC); return rc; } #endif #ifndef NO__1GDK_1TYPE_1RGBA -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1GDK_1TYPE_1RGBA) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1GDK_1TYPE_1RGBA) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1GDK_1TYPE_1RGBA_FUNC); - rc = (jintLong)GDK_TYPE_RGBA; + rc = (jlong)GDK_TYPE_RGBA; GDK_NATIVE_EXIT(env, that, _1GDK_1TYPE_1RGBA_FUNC); return rc; } #endif #ifndef NO__1gdk_1atom_1intern -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1atom_1intern) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1atom_1intern) (JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1atom_1intern_FUNC); if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)gdk_atom_intern((const gchar *)lparg0, arg1); + rc = (jlong)gdk_atom_intern((const gchar *)lparg0, arg1); */ { GDK_LOAD_FUNCTION(fp, gdk_atom_intern) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, jboolean))fp)((const gchar *)lparg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(const gchar *, jboolean))fp)((const gchar *)lparg0, arg1); } } fail: @@ -265,30 +265,30 @@ fail: #endif #ifndef NO__1gdk_1atom_1name -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1atom_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1atom_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1atom_1name_FUNC); - rc = (jintLong)gdk_atom_name((GdkAtom)arg0); + rc = (jlong)gdk_atom_name((GdkAtom)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1atom_1name_FUNC); return rc; } #endif #ifndef NO__1gdk_1cairo_1create -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cairo_1create) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1cairo_1create) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1cairo_1create_FUNC); /* - rc = (jintLong)gdk_cairo_create((GdkWindow *)arg0); + rc = (jlong)gdk_cairo_create((GdkWindow *)arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_cairo_create) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1cairo_1create_FUNC); @@ -298,7 +298,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cairo_1create) #ifndef NO__1gdk_1cairo_1get_1clip_1rectangle JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1cairo_1get_1clip_1rectangle) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; jboolean rc = 0; @@ -314,7 +314,7 @@ fail: #ifndef NO__1gdk_1cairo_1region JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1cairo_1region) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_FUNC); gdk_cairo_region((cairo_t *)arg0, (cairo_region_t *)arg1); @@ -323,12 +323,12 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1cairo_1region) #endif #ifndef NO__1gdk_1cairo_1region_1create_1from_1surface -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cairo_1region_1create_1from_1surface) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1cairo_1region_1create_1from_1surface) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_1create_1from_1surface_FUNC); - rc = (jintLong)gdk_cairo_region_create_from_surface((cairo_surface_t *)arg0); + rc = (jlong)gdk_cairo_region_create_from_surface((cairo_surface_t *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1cairo_1region_1create_1from_1surface_FUNC); return rc; } @@ -336,7 +336,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cairo_1region_1create_1from_1surfac #ifndef NO__1gdk_1cairo_1set_1source_1pixbuf JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1cairo_1set_1source_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3) { GDK_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1pixbuf_FUNC); gdk_cairo_set_source_pixbuf((cairo_t *)arg0, (const GdkPixbuf *)arg1, (gdouble)arg2, (gdouble)arg3); @@ -346,7 +346,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1cairo_1set_1source_1pixbuf) #ifndef NO__1gdk_1cairo_1set_1source_1rgba JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1cairo_1set_1source_1rgba) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRGBA _arg1, *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1rgba_FUNC); @@ -360,7 +360,7 @@ fail: #ifndef NO__1gdk_1cairo_1set_1source_1window JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1cairo_1set_1source_1window) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { GDK_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1window_FUNC); gdk_cairo_set_source_window((cairo_t *)arg0, (GdkWindow *)arg1, (gdouble)arg2, (gdouble)arg3); @@ -369,120 +369,98 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1cairo_1set_1source_1window) #endif #ifndef NO__1gdk_1cursor_1new_1for_1display -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1for_1display) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1for_1display) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1for_1display_FUNC); - rc = (jintLong)gdk_cursor_new_for_display((GdkDisplay *)arg0, (GdkCursorType)arg1); + rc = (jlong)gdk_cursor_new_for_display((GdkDisplay *)arg0, (GdkCursorType)arg1); GDK_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1for_1display_FUNC); return rc; } #endif -#if (!defined(NO__1gdk_1cursor_1new_1from_1name__I_3B) && !defined(JNI64)) || (!defined(NO__1gdk_1cursor_1new_1from_1name__J_3B) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1name__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#else -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1name__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#endif +#ifndef NO__1gdk_1cursor_1new_1from_1name__J_3B +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1name__J_3B) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; -#ifndef JNI64 - GDK_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1name__I_3B_FUNC); -#else + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1name__J_3B_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_cursor_new_from_name((GdkDisplay *)arg0, (const gchar *)lparg1); + rc = (jlong)gdk_cursor_new_from_name((GdkDisplay *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GDK_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1name__I_3B_FUNC); -#else GDK_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1name__J_3B_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1gdk_1cursor_1new_1from_1name___3BI) && !defined(JNI64)) || (!defined(NO__1gdk_1cursor_1new_1from_1name___3BJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1name___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) -#else -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1name___3BJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) -#endif +#ifndef NO__1gdk_1cursor_1new_1from_1name___3BJ +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1name___3BJ) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; -#ifndef JNI64 - GDK_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1name___3BI_FUNC); -#else + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1name___3BJ_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_cursor_new_from_name((const gchar *)lparg0, (GdkCursor *)arg1); + rc = (jlong)gdk_cursor_new_from_name((const gchar *)lparg0, (GdkCursor *)arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); -#ifndef JNI64 - GDK_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1name___3BI_FUNC); -#else GDK_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1name___3BJ_FUNC); -#endif return rc; } #endif #ifndef NO__1gdk_1cursor_1new_1from_1pixbuf -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC); - rc = (jintLong)gdk_cursor_new_from_pixbuf((GdkDisplay *)arg0, (GdkPixbuf *)arg1, (gint)arg2, (gint)arg3); + rc = (jlong)gdk_cursor_new_from_pixbuf((GdkDisplay *)arg0, (GdkPixbuf *)arg1, (gint)arg2, (gint)arg3); GDK_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC); return rc; } #endif #ifndef NO__1gdk_1cursor_1new_1from_1texture -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1texture) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1cursor_1new_1from_1texture) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1texture_FUNC); - rc = (jintLong)gdk_cursor_new_from_texture((GdkTexture *)arg0, (gint)arg1, (gint)arg2, (GdkCursor *)arg3); + rc = (jlong)gdk_cursor_new_from_texture((GdkTexture *)arg0, (gint)arg1, (gint)arg2, (GdkCursor *)arg3); GDK_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1texture_FUNC); return rc; } #endif #ifndef NO__1gdk_1device_1get_1associated_1device -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1device_1get_1associated_1device) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1device_1get_1associated_1device) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1device_1get_1associated_1device_FUNC); - rc = (jintLong)gdk_device_get_associated_device((GdkDevice *)arg0); + rc = (jlong)gdk_device_get_associated_device((GdkDevice *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1device_1get_1associated_1device_FUNC); return rc; } #endif #ifndef NO__1gdk_1device_1get_1seat -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1device_1get_1seat) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1device_1get_1seat) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1device_1get_1seat_FUNC); /* - rc = (jintLong)gdk_device_get_seat((GdkDevice *)arg0); + rc = (jlong)gdk_device_get_seat((GdkDevice *)arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_device_get_seat) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDevice *))fp)((GdkDevice *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkDevice *))fp)((GdkDevice *)arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1device_1get_1seat_FUNC); @@ -491,16 +469,16 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1device_1get_1seat) #endif #ifndef NO__1gdk_1device_1get_1surface_1at_1position -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1device_1get_1surface_1at_1position) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1device_1get_1surface_1at_1position) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1device_1get_1surface_1at_1position_FUNC); if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_device_get_surface_at_position((GdkDevice *)arg0, (gint *)lparg1, (gint *)lparg2); + rc = (jlong)gdk_device_get_surface_at_position((GdkDevice *)arg0, (gint *)lparg1, (gint *)lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0); @@ -510,16 +488,16 @@ fail: #endif #ifndef NO__1gdk_1device_1get_1window_1at_1position -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1device_1get_1window_1at_1position) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1device_1get_1window_1at_1position) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1device_1get_1window_1at_1position_FUNC); if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_device_get_window_at_position((GdkDevice *)arg0, (gint *)lparg1, (gint *)lparg2); + rc = (jlong)gdk_device_get_window_at_position((GdkDevice *)arg0, (gint *)lparg1, (gint *)lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0); @@ -530,7 +508,7 @@ fail: #ifndef NO__1gdk_1device_1grab JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1device_1grab) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4, jintLong arg5, jint arg6) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3, jint arg4, jlong arg5, jint arg6) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1device_1grab_FUNC); @@ -549,18 +527,18 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1device_1grab) #endif #ifndef NO__1gdk_1device_1manager_1get_1client_1pointer -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1device_1manager_1get_1client_1pointer) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1device_1manager_1get_1client_1pointer) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1device_1manager_1get_1client_1pointer_FUNC); /* - rc = (jintLong)gdk_device_manager_get_client_pointer(arg0); + rc = (jlong)gdk_device_manager_get_client_pointer(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_device_manager_get_client_pointer) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1device_1manager_1get_1client_1pointer_FUNC); @@ -570,7 +548,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1device_1manager_1get_1client_1point #ifndef NO__1gdk_1device_1ungrab JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1ungrab) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1device_1ungrab_FUNC); /* @@ -586,51 +564,29 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1ungrab) } #endif -#if (!defined(NO__1gdk_1device_1warp__III) && !defined(JNI64)) || (!defined(NO__1gdk_1device_1warp__JII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1warp__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) -#else -JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1warp__JII)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) -#endif +#ifndef NO__1gdk_1device_1warp__JII +JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1warp__JII) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { -#ifndef JNI64 - GDK_NATIVE_ENTER(env, that, _1gdk_1device_1warp__III_FUNC); -#else GDK_NATIVE_ENTER(env, that, _1gdk_1device_1warp__JII_FUNC); -#endif gdk_device_warp((GdkDevice *)arg0, (gint)arg1, (gint)arg2); -#ifndef JNI64 - GDK_NATIVE_EXIT(env, that, _1gdk_1device_1warp__III_FUNC); -#else GDK_NATIVE_EXIT(env, that, _1gdk_1device_1warp__JII_FUNC); -#endif } #endif -#if (!defined(NO__1gdk_1device_1warp__IIII) && !defined(JNI64)) || (!defined(NO__1gdk_1device_1warp__JJII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1warp__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) -#else -JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1warp__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) -#endif +#ifndef NO__1gdk_1device_1warp__JJII +JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1device_1warp__JJII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { -#ifndef JNI64 - GDK_NATIVE_ENTER(env, that, _1gdk_1device_1warp__IIII_FUNC); -#else GDK_NATIVE_ENTER(env, that, _1gdk_1device_1warp__JJII_FUNC); -#endif gdk_device_warp((GdkDevice *)arg0, (GdkScreen *)arg1, (gint)arg2, (gint)arg3); -#ifndef JNI64 - GDK_NATIVE_EXIT(env, that, _1gdk_1device_1warp__IIII_FUNC); -#else GDK_NATIVE_EXIT(env, that, _1gdk_1device_1warp__JJII_FUNC); -#endif } #endif #ifndef NO__1gdk_1display_1beep JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1display_1beep) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1display_1beep_FUNC); gdk_display_beep((GdkDisplay *)arg0); @@ -639,42 +595,42 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1display_1beep) #endif #ifndef NO__1gdk_1display_1get_1default -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1default) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_FUNC); - rc = (jintLong)gdk_display_get_default(); + rc = (jlong)gdk_display_get_default(); GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_FUNC); return rc; } #endif #ifndef NO__1gdk_1display_1get_1default_1group -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1default_1group) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1default_1group) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_1group_FUNC); - rc = (jintLong)gdk_display_get_default_group((GdkDisplay *)arg0); + rc = (jlong)gdk_display_get_default_group((GdkDisplay *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_1group_FUNC); return rc; } #endif #ifndef NO__1gdk_1display_1get_1default_1seat -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1default_1seat) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1default_1seat) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_1seat_FUNC); /* - rc = (jintLong)gdk_display_get_default_seat(arg0); + rc = (jlong)gdk_display_get_default_seat(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_display_get_default_seat) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_1seat_FUNC); @@ -683,18 +639,18 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1default_1seat) #endif #ifndef NO__1gdk_1display_1get_1device_1manager -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1device_1manager) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1device_1manager) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1device_1manager_FUNC); /* - rc = (jintLong)gdk_display_get_device_manager((GdkDisplay *)arg0); + rc = (jlong)gdk_display_get_device_manager((GdkDisplay *)arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_display_get_device_manager) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDisplay *))fp)((GdkDisplay *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkDisplay *))fp)((GdkDisplay *)arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1device_1manager_FUNC); @@ -703,30 +659,30 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1device_1manager) #endif #ifndef NO__1gdk_1display_1get_1keymap -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1keymap) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1keymap) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1keymap_FUNC); - rc = (jintLong)gdk_display_get_keymap((GdkDisplay *)arg0); + rc = (jlong)gdk_display_get_keymap((GdkDisplay *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1keymap_FUNC); return rc; } #endif #ifndef NO__1gdk_1display_1get_1monitor -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1monitor_FUNC); /* - rc = (jintLong)gdk_display_get_monitor(arg0, arg1); + rc = (jlong)gdk_display_get_monitor(arg0, arg1); */ { GDK_LOAD_FUNCTION(fp, gdk_display_get_monitor) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1monitor_FUNC); @@ -735,18 +691,18 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor) #endif #ifndef NO__1gdk_1display_1get_1monitor_1at_1point -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1point) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1point) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1monitor_1at_1point_FUNC); /* - rc = (jintLong)gdk_display_get_monitor_at_point(arg0, arg1, arg2); + rc = (jlong)gdk_display_get_monitor_at_point(arg0, arg1, arg2); */ { GDK_LOAD_FUNCTION(fp, gdk_display_get_monitor_at_point) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint, jint))fp)(arg0, arg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint, jint))fp)(arg0, arg1, arg2); } } GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1monitor_1at_1point_FUNC); @@ -755,30 +711,30 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1point) #endif #ifndef NO__1gdk_1display_1get_1monitor_1at_1surface -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1surface) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1monitor_1at_1surface_FUNC); - rc = (jintLong)gdk_display_get_monitor_at_surface((GdkDisplay *)arg0, (GdkSurface *)arg1); + rc = (jlong)gdk_display_get_monitor_at_surface((GdkDisplay *)arg0, (GdkSurface *)arg1); GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1monitor_1at_1surface_FUNC); return rc; } #endif #ifndef NO__1gdk_1display_1get_1monitor_1at_1window -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1window) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1window) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1monitor_1at_1window_FUNC); /* - rc = (jintLong)gdk_display_get_monitor_at_window((GdkDisplay *)arg0, (GdkWindow *)arg1); + rc = (jlong)gdk_display_get_monitor_at_window((GdkDisplay *)arg0, (GdkWindow *)arg1); */ { GDK_LOAD_FUNCTION(fp, gdk_display_get_monitor_at_window) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDisplay *, GdkWindow *))fp)((GdkDisplay *)arg0, (GdkWindow *)arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkDisplay *, GdkWindow *))fp)((GdkDisplay *)arg0, (GdkWindow *)arg1); } } GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1monitor_1at_1window_FUNC); @@ -800,7 +756,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1monitor_1at_1window) #ifndef NO__1gdk_1display_1get_1n_1monitors JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1display_1get_1n_1monitors) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1n_1monitors_FUNC); @@ -810,7 +766,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1display_1get_1n_1monitors) { GDK_LOAD_FUNCTION(fp, gdk_display_get_n_monitors) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1n_1monitors_FUNC); @@ -821,18 +777,18 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1display_1get_1n_1monitors) #endif #ifndef NO__1gdk_1display_1get_1primary_1monitor -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1primary_1monitor) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1get_1primary_1monitor) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1get_1primary_1monitor_FUNC); /* - rc = (jintLong)gdk_display_get_primary_monitor(arg0); + rc = (jlong)gdk_display_get_primary_monitor(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_display_get_primary_monitor) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1display_1get_1primary_1monitor_FUNC); @@ -839,12 +795,12 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1peek_1event) #endif #ifndef NO__1gdk_1display_1peek_1event -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1peek_1event) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1display_1peek_1event) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1peek_1event_FUNC); - rc = (jintLong)gdk_display_peek_event((GdkDisplay *)arg0); + rc = (jlong)gdk_display_peek_event((GdkDisplay *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1display_1peek_1event_FUNC); return rc; } @@ -852,7 +808,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1display_1put_1event) #ifndef NO__1gdk_1display_1supports_1cursor_1color JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1display_1supports_1cursor_1color) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC); @@ -874,7 +830,7 @@ JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1display_1supports_1cursor_1color) #ifndef NO__1gdk_1drag_1context_1get_1actions JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1drag_1context_1get_1actions) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1actions_FUNC); @@ -885,12 +841,12 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1drag_1context_1get_1actions) #endif #ifndef NO__1gdk_1drag_1context_1get_1dest_1window -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1drag_1context_1get_1dest_1window) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1drag_1context_1get_1dest_1window) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1dest_1window_FUNC); - rc = (jintLong)gdk_drag_context_get_dest_window((GdkDragContext *)arg0); + rc = (jlong)gdk_drag_context_get_dest_window((GdkDragContext *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1get_1dest_1window_FUNC); return rc; } @@ -898,7 +854,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1drag_1context_1get_1dest_1window) #ifndef NO__1gdk_1drag_1context_1get_1selected_1action JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1drag_1context_1get_1selected_1action) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1selected_1action_FUNC); @@ -909,12 +865,12 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1drag_1context_1get_1selected_1action) #endif #ifndef NO__1gdk_1drag_1context_1list_1targets -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1drag_1context_1list_1targets) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1drag_1context_1list_1targets) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1list_1targets_FUNC); - rc = (jintLong)gdk_drag_context_list_targets((GdkDragContext *)arg0); + rc = (jlong)gdk_drag_context_list_targets((GdkDragContext *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1list_1targets_FUNC); return rc; } @@ -922,7 +878,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1drag_1context_1list_1targets) #ifndef NO__1gdk_1drag_1status JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1drag_1status) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1drag_1status_FUNC); gdk_drag_status((GdkDragContext *)arg0, (GdkDragAction)arg1, (guint32)arg2); @@ -931,18 +887,18 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1drag_1status) #endif #ifndef NO__1gdk_1drawing_1context_1get_1cairo_1context -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1drawing_1context_1get_1cairo_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1drawing_1context_1get_1cairo_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1drawing_1context_1get_1cairo_1context_FUNC); /* - rc = (jintLong)gdk_drawing_context_get_cairo_context((GdkDrawingContext *)arg0); + rc = (jlong)gdk_drawing_context_get_cairo_context((GdkDrawingContext *)arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_drawing_context_get_cairo_context) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDrawingContext *))fp)((GdkDrawingContext *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkDrawingContext *))fp)((GdkDrawingContext *)arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1drawing_1context_1get_1cairo_1context_FUNC); @@ -951,12 +907,12 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1drawing_1context_1get_1cairo_1conte #endif #ifndef NO__1gdk_1event_1copy -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1copy) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1copy) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1copy_FUNC); - rc = (jintLong)gdk_event_copy((GdkEvent *)arg0); + rc = (jlong)gdk_event_copy((GdkEvent *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1event_1copy_FUNC); return rc; } @@ -964,7 +920,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1copy) #ifndef NO__1gdk_1event_1free JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1event_1free_FUNC); gdk_event_free((GdkEvent *)arg0); @@ -973,12 +929,12 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1free) #endif #ifndef NO__1gdk_1event_1get -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1get) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_FUNC); - rc = (jintLong)gdk_event_get(); + rc = (jlong)gdk_event_get(); GDK_NATIVE_EXIT(env, that, _1gdk_1event_1get_FUNC); return rc; } @@ -986,7 +942,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get) #ifndef NO__1gdk_1event_1get_1button JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1button) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jboolean rc = 0; @@ -1002,7 +958,7 @@ fail: #ifndef NO__1gdk_1event_1get_1coords JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1coords) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -1021,7 +977,7 @@ fail: #ifndef NO__1gdk_1event_1get_1crossing_1mode JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1crossing_1mode) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jboolean rc = 0; @@ -1037,7 +993,7 @@ fail: #ifndef NO__1gdk_1event_1get_1event_1type JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1event_1get_1event_1type) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_1event_1type_FUNC); @@ -1057,7 +1013,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1event_1get_1event_1type) #ifndef NO__1gdk_1event_1get_1focus_1in JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1focus_1in) - (JNIEnv *env, jclass that, jintLong arg0, jbooleanArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbooleanArray arg1) { jboolean *lparg1=NULL; jboolean rc = 0; @@ -1073,7 +1029,7 @@ fail: #ifndef NO__1gdk_1event_1get_1key_1group JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1key_1group) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jboolean rc = 0; @@ -1089,7 +1045,7 @@ fail: #ifndef NO__1gdk_1event_1get_1keycode JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1keycode) - (JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jshortArray arg1) { jshort *lparg1=NULL; jboolean rc = 0; @@ -1105,7 +1061,7 @@ fail: #ifndef NO__1gdk_1event_1get_1keyval JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1keyval) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jboolean rc = 0; @@ -1121,7 +1077,7 @@ fail: #ifndef NO__1gdk_1event_1get_1root_1coords JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1root_1coords) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -1140,7 +1096,7 @@ fail: #ifndef NO__1gdk_1event_1get_1scroll_1deltas JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1scroll_1deltas) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -1159,7 +1115,7 @@ fail: #ifndef NO__1gdk_1event_1get_1scroll_1direction JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1scroll_1direction) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jboolean rc = 0; @@ -1174,18 +1130,18 @@ fail: #endif #ifndef NO__1gdk_1event_1get_1seat -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get_1seat) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1get_1seat) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_1seat_FUNC); /* - rc = (jintLong)gdk_event_get_seat(arg0); + rc = (jlong)gdk_event_get_seat(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_event_get_seat) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1event_1get_1seat_FUNC); @@ -1195,7 +1151,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get_1seat) #ifndef NO__1gdk_1event_1get_1state JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1state) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jboolean rc = 0; @@ -1211,27 +1167,27 @@ fail: #ifndef NO__1gdk_1event_1get_1string JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1string) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_1string_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jboolean)gdk_event_get_string((GdkEvent *)arg0, (const char **)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1event_1get_1string_FUNC); return rc; } #endif #ifndef NO__1gdk_1event_1get_1surface -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get_1surface) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1get_1surface) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_1surface_FUNC); - rc = (jintLong)gdk_event_get_surface((GdkEvent *)arg0); + rc = (jlong)gdk_event_get_surface((GdkEvent *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1event_1get_1surface_FUNC); return rc; } @@ -1239,7 +1195,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get_1surface) #ifndef NO__1gdk_1event_1get_1time JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1event_1get_1time) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_1time_FUNC); @@ -1250,12 +1206,12 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1event_1get_1time) #endif #ifndef NO__1gdk_1event_1get_1window -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get_1window) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1get_1window) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_1window_FUNC); - rc = (jintLong)gdk_event_get_window((GdkEvent *)arg0); + rc = (jlong)gdk_event_get_window((GdkEvent *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1event_1get_1window_FUNC); return rc; } @@ -1263,7 +1219,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1get_1window) #ifndef NO__1gdk_1event_1handler_1set JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1handler_1set) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1event_1handler_1set_FUNC); gdk_event_handler_set((GdkEventFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2); @@ -1272,24 +1228,24 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1handler_1set) #endif #ifndef NO__1gdk_1event_1new -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1new) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1new_FUNC); - rc = (jintLong)gdk_event_new(arg0); + rc = (jlong)gdk_event_new(arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1event_1new_FUNC); return rc; } #endif #ifndef NO__1gdk_1event_1peek -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1peek) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1peek) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1event_1peek_FUNC); - rc = (jintLong)gdk_event_peek(); + rc = (jlong)gdk_event_peek(); GDK_NATIVE_EXIT(env, that, _1gdk_1event_1peek_FUNC); return rc; } @@ -1297,7 +1253,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1event_1peek) #ifndef NO__1gdk_1event_1put JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1put) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1event_1put_FUNC); gdk_event_put((GdkEvent *)arg0); @@ -1307,7 +1263,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1put) #ifndef NO__1gdk_1event_1set_1device JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1set_1device) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1event_1set_1device_FUNC); gdk_event_set_device((GdkEvent *)arg0, (GdkDevice *)arg1); @@ -1316,12 +1272,12 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1event_1set_1device) #endif #ifndef NO__1gdk_1get_1default_1root_1window -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1get_1default_1root_1window) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1get_1default_1root_1window) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1get_1default_1root_1window_FUNC); - rc = (jintLong)gdk_get_default_root_window(); + rc = (jlong)gdk_get_default_root_window(); GDK_NATIVE_EXIT(env, that, _1gdk_1get_1default_1root_1window_FUNC); return rc; } @@ -1329,36 +1285,36 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1get_1default_1root_1window) #ifndef NO__1gdk_1keymap_1get_1entries_1for_1keyval JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1keymap_1get_1entries_1for_1keyval) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2, jintArray arg3) { - jintLong *lparg2=NULL; + jlong *lparg2=NULL; jint *lparg3=NULL; jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1entries_1for_1keyval_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jboolean)gdk_keymap_get_entries_for_keyval((GdkKeymap*)arg0, (guint)arg1, (GdkKeymapKey**)lparg2, (gint*)lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); + if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1entries_1for_1keyval_FUNC); return rc; } #endif #ifndef NO__1gdk_1keymap_1get_1for_1display -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1keymap_1get_1for_1display) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1keymap_1get_1for_1display) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1for_1display_FUNC); /* - rc = (jintLong)gdk_keymap_get_for_display((GdkDisplay *)arg0); + rc = (jlong)gdk_keymap_get_for_display((GdkDisplay *)arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_keymap_get_for_display) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDisplay *))fp)((GdkDisplay *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkDisplay *))fp)((GdkDisplay *)arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1for_1display_FUNC); @@ -1368,7 +1324,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1keymap_1get_1for_1display) #ifndef NO__1gdk_1keymap_1translate_1keyboard_1state JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1keymap_1translate_1keyboard_1state) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7) { jint *lparg4=NULL; jint *lparg5=NULL; @@ -1417,7 +1373,7 @@ JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1keyval_1to_1unicode) #ifndef NO__1gdk_1monitor_1get_1geometry JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1geometry) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1monitor_1get_1geometry_FUNC); @@ -1428,7 +1384,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1geometry) { GDK_LOAD_FUNCTION(fp, gdk_monitor_get_geometry) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, GdkRectangle *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, GdkRectangle *))fp)(arg0, lparg1); } } fail: @@ -1439,7 +1395,7 @@ fail: #ifndef NO__1gdk_1monitor_1get_1scale_1factor JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1scale_1factor) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1monitor_1get_1scale_1factor_FUNC); @@ -1449,7 +1405,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1scale_1factor) { GDK_LOAD_FUNCTION(fp, gdk_monitor_get_scale_factor) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1monitor_1get_1scale_1factor_FUNC); @@ -1459,7 +1415,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1scale_1factor) #ifndef NO__1gdk_1monitor_1get_1width_1mm JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1width_1mm) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1monitor_1get_1width_1mm_FUNC); @@ -1469,7 +1425,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1width_1mm) { GDK_LOAD_FUNCTION(fp, gdk_monitor_get_width_mm) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1monitor_1get_1width_1mm_FUNC); @@ -1479,7 +1435,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1width_1mm) #ifndef NO__1gdk_1monitor_1get_1workarea JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1workarea) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1monitor_1get_1workarea_FUNC); @@ -1490,7 +1446,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1monitor_1get_1workarea) { GDK_LOAD_FUNCTION(fp, gdk_monitor_get_workarea) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, GdkRectangle *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, GdkRectangle *))fp)(arg0, lparg1); } } fail: @@ -1500,18 +1456,18 @@ fail: #endif #ifndef NO__1gdk_1pango_1context_1get -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pango_1context_1get) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pango_1context_1get) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1get_FUNC); /* - rc = (jintLong)gdk_pango_context_get(); + rc = (jlong)gdk_pango_context_get(); */ { GDK_LOAD_FUNCTION(fp, gdk_pango_context_get) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } GDK_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1get_FUNC); @@ -1520,14 +1476,14 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pango_1context_1get) #endif #ifndef NO__1gdk_1pango_1layout_1get_1clip_1region -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4) { jint *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, (gint *)lparg3, arg4); + rc = (jlong)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, (gint *)lparg3, arg4); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC); @@ -1537,7 +1493,7 @@ fail: #ifndef NO__1gdk_1pixbuf_1copy_1area JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1pixbuf_1copy_1area) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7) { GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1copy_1area_FUNC); gdk_pixbuf_copy_area((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, (GdkPixbuf *)arg5, arg6, arg7); @@ -1547,7 +1503,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1pixbuf_1copy_1area) #ifndef NO__1gdk_1pixbuf_1get_1has_1alpha JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC); @@ -1559,7 +1515,7 @@ JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha) #ifndef NO__1gdk_1pixbuf_1get_1height JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1height) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1height_FUNC); @@ -1570,12 +1526,12 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1height) #endif #ifndef NO__1gdk_1pixbuf_1get_1pixels -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1pixels) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1pixels) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC); - rc = (jintLong)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0); + rc = (jlong)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC); return rc; } @@ -1583,7 +1539,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1pixels) #ifndef NO__1gdk_1pixbuf_1get_1rowstride JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1rowstride) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC); @@ -1595,7 +1551,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1rowstride) #ifndef NO__1gdk_1pixbuf_1get_1width JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1width_FUNC); @@ -1607,39 +1563,39 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1pixbuf_1get_1width) #ifndef NO__1gdk_1pixbuf_1loader_1close JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1pixbuf_1loader_1close) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1close_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jboolean)gdk_pixbuf_loader_close((GdkPixbufLoader *)arg0, (GError **)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1close_FUNC); return rc; } #endif #ifndef NO__1gdk_1pixbuf_1loader_1get_1pixbuf -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC); - rc = (jintLong)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0); + rc = (jlong)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC); return rc; } #endif #ifndef NO__1gdk_1pixbuf_1loader_1new -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1loader_1new) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1loader_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1new_FUNC); - rc = (jintLong)gdk_pixbuf_loader_new(); + rc = (jlong)gdk_pixbuf_loader_new(); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1new_FUNC); return rc; } @@ -1647,45 +1603,45 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1loader_1new) #ifndef NO__1gdk_1pixbuf_1loader_1write JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1pixbuf_1loader_1write) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3) { - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1write_FUNC); - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jboolean)gdk_pixbuf_loader_write((GdkPixbufLoader *)arg0, (const guchar *)arg1, (gsize)arg2, (GError **)lparg3); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1write_FUNC); return rc; } #endif #ifndef NO__1gdk_1pixbuf_1new -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1new) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1new) (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_FUNC); - rc = (jintLong)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4); + rc = (jlong)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_FUNC); return rc; } #endif #ifndef NO__1gdk_1pixbuf_1new_1from_1file -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1new_1from_1file) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1new_1from_1file) + (JNIEnv *env, jclass that, jbyteArray arg0, jlongArray arg1) { jbyte *lparg0=NULL; - jintLong *lparg1=NULL; - jintLong rc = 0; + jlong *lparg1=NULL; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1); + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + rc = (jlong)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC); return rc; @@ -1694,42 +1650,42 @@ fail: #ifndef NO__1gdk_1pixbuf_1save_1to_1bufferv JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1pixbuf_1save_1to_1bufferv) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jbyteArray arg3, jintLongArray arg4, jintLongArray arg5, jintLongArray arg6) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jbyteArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6) { - jintLong *lparg1=NULL; - jintLong *lparg2=NULL; + jlong *lparg1=NULL; + jlong *lparg2=NULL; jbyte *lparg3=NULL; - jintLong *lparg4=NULL; - jintLong *lparg5=NULL; - jintLong *lparg6=NULL; + jlong *lparg4=NULL; + jlong *lparg5=NULL; + jlong *lparg6=NULL; jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1save_1to_1bufferv_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; + if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail; rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (char **)lparg4, (char **)lparg5, (GError **)lparg6); fail: - if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0); - if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0); + if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1save_1to_1bufferv_FUNC); return rc; } #endif #ifndef NO__1gdk_1pixbuf_1scale_1simple -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1scale_1simple) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1scale_1simple) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC); - rc = (jintLong)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3); + rc = (jlong)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3); GDK_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC); return rc; } @@ -1737,7 +1693,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1scale_1simple) #ifndef NO__1gdk_1property_1get JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1property_1get) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9) { jintLong *lparg6=NULL; jint *lparg7=NULL; @@ -1762,7 +1718,7 @@ fail: #ifndef NO__1gdk_1rgba_1free JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1rgba_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1rgba_1free_FUNC); gdk_rgba_free((GdkRGBA *)arg0); @@ -1787,16 +1743,16 @@ fail: #endif #ifndef NO__1gdk_1rgba_1parse -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1rgba_1parse) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1rgba_1parse) (JNIEnv *env, jclass that, jobject arg0, jbyteArray arg1) { GdkRGBA _arg0, *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1rgba_1parse_FUNC); if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_rgba_parse((GdkRGBA *)lparg0, (const gchar *)lparg1); + rc = (jlong)gdk_rgba_parse((GdkRGBA *)lparg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0); @@ -1806,14 +1762,14 @@ fail: #endif #ifndef NO__1gdk_1rgba_1to_1string -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1rgba_1to_1string) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1rgba_1to_1string) (JNIEnv *env, jclass that, jobject arg0) { GdkRGBA _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1rgba_1to_1string_FUNC); if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)gdk_rgba_to_string((GdkRGBA *)lparg0); + rc = (jlong)gdk_rgba_to_string((GdkRGBA *)lparg0); fail: if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0); GDK_NATIVE_EXIT(env, that, _1gdk_1rgba_1to_1string_FUNC); @@ -1822,12 +1778,12 @@ fail: #endif #ifndef NO__1gdk_1screen_1get_1default -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1screen_1get_1default) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1screen_1get_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1default_FUNC); - rc = (jintLong)gdk_screen_get_default(); + rc = (jlong)gdk_screen_get_default(); GDK_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1default_FUNC); return rc; } @@ -1835,7 +1791,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1screen_1get_1default) #ifndef NO__1gdk_1screen_1get_1monitor_1at_1point JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC); @@ -1855,7 +1811,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point) #ifndef NO__1gdk_1screen_1get_1monitor_1at_1window JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC); @@ -1875,7 +1831,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window) #ifndef NO__1gdk_1screen_1get_1monitor_1geometry JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1geometry) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GdkRectangle _arg2, *lparg2=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC); @@ -1897,7 +1853,7 @@ fail: #ifndef NO__1gdk_1screen_1get_1monitor_1scale_1factor JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1scale_1factor) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1scale_1factor_FUNC); @@ -1917,7 +1873,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1scale_1factor) #ifndef NO__1gdk_1screen_1get_1monitor_1workarea JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1screen_1get_1monitor_1workarea) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GdkRectangle _arg2, *lparg2=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1workarea_FUNC); @@ -1939,7 +1895,7 @@ fail: #ifndef NO__1gdk_1screen_1get_1n_1monitors JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1n_1monitors) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC); @@ -1959,7 +1915,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1n_1monitors) #ifndef NO__1gdk_1screen_1get_1primary_1monitor JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1primary_1monitor) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1primary_1monitor_FUNC); @@ -1979,7 +1935,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1get_1primary_1monitor) #ifndef NO__1gdk_1screen_1get_1resolution JNIEXPORT jdouble JNICALL GDK_NATIVE(_1gdk_1screen_1get_1resolution) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1resolution_FUNC); @@ -1990,12 +1946,12 @@ JNIEXPORT jdouble JNICALL GDK_NATIVE(_1gdk_1screen_1get_1resolution) #endif #ifndef NO__1gdk_1screen_1get_1system_1visual -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1screen_1get_1system_1visual) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1screen_1get_1system_1visual) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1system_1visual_FUNC); - rc = (jintLong)gdk_screen_get_system_visual((GdkScreen *)arg0); + rc = (jlong)gdk_screen_get_system_visual((GdkScreen *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1system_1visual_FUNC); return rc; } @@ -2023,7 +1979,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1height) #ifndef NO__1gdk_1screen_1is_1composited JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1screen_1is_1composited) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1screen_1is_1composited_FUNC); @@ -2054,18 +2010,18 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1screen_1width) #endif #ifndef NO__1gdk_1seat_1get_1keyboard -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1seat_1get_1keyboard) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1seat_1get_1keyboard) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1seat_1get_1keyboard_FUNC); /* - rc = (jintLong)gdk_seat_get_keyboard(arg0); + rc = (jlong)gdk_seat_get_keyboard(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_seat_get_keyboard) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1seat_1get_1keyboard_FUNC); @@ -2074,18 +2030,18 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1seat_1get_1keyboard) #endif #ifndef NO__1gdk_1seat_1get_1pointer -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1seat_1get_1pointer) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1seat_1get_1pointer) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1seat_1get_1pointer_FUNC); /* - rc = (jintLong)gdk_seat_get_pointer(arg0); + rc = (jlong)gdk_seat_get_pointer(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_seat_get_pointer) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1seat_1get_1pointer_FUNC); @@ -2095,7 +2051,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1seat_1get_1pointer) #ifndef NO__1gdk_1seat_1grab JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1seat_1grab) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1seat_1grab_FUNC); @@ -2105,7 +2061,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1seat_1grab) { GDK_LOAD_FUNCTION(fp, gdk_seat_grab) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jboolean, jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jlong, jint, jboolean, jlong, jlong, jlong, jlong))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); } } GDK_NATIVE_EXIT(env, that, _1gdk_1seat_1grab_FUNC); @@ -2115,7 +2071,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1seat_1grab) #ifndef NO__1gdk_1seat_1ungrab JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1seat_1ungrab) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1seat_1ungrab_FUNC); /* @@ -2124,7 +2080,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1seat_1ungrab) { GDK_LOAD_FUNCTION(fp, gdk_seat_ungrab) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1seat_1ungrab_FUNC); @@ -2133,7 +2089,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1seat_1ungrab) #ifndef NO__1gdk_1selection_1owner_1get JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1selection_1owner_1get) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1selection_1owner_1get_FUNC); gdk_selection_owner_get((GdkAtom)arg0); @@ -2143,7 +2099,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1selection_1owner_1get) #ifndef NO__1gdk_1selection_1owner_1set JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1selection_1owner_1set) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3) { GDK_NATIVE_ENTER(env, that, _1gdk_1selection_1owner_1set_FUNC); gdk_selection_owner_set((GdkWindow *)arg0, (GdkAtom)arg1, (guint32)arg2, (gboolean)arg3); @@ -2174,12 +2130,12 @@ fail: #endif #ifndef NO__1gdk_1surface_1create_1similar_1surface -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1surface_1create_1similar_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1surface_1create_1similar_1surface) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1create_1similar_1surface_FUNC); - rc = (jintLong)gdk_surface_create_similar_surface((GdkSurface *)arg0, (cairo_content_t)arg1, arg2, arg3); + rc = (jlong)gdk_surface_create_similar_surface((GdkSurface *)arg0, (cairo_content_t)arg1, arg2, arg3); GDK_NATIVE_EXIT(env, that, _1gdk_1surface_1create_1similar_1surface_FUNC); return rc; } @@ -2187,7 +2143,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1surface_1create_1similar_1surface) #ifndef NO__1gdk_1surface_1destroy JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1destroy_FUNC); gdk_surface_destroy((GdkSurface *)arg0); @@ -2197,7 +2153,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1destroy) #ifndef NO__1gdk_1surface_1focus JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1focus) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1focus_FUNC); gdk_surface_focus((GdkSurface *)arg0, arg1); @@ -2206,30 +2162,30 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1focus) #endif #ifndef NO__1gdk_1surface_1get_1children -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1surface_1get_1children) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1surface_1get_1children) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1children_FUNC); - rc = (jintLong)gdk_surface_get_children((GdkSurface *)arg0); + rc = (jlong)gdk_surface_get_children((GdkSurface *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1surface_1get_1children_FUNC); return rc; } #endif #ifndef NO__1gdk_1surface_1get_1device_1position -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1surface_1get_1device_1position) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1surface_1get_1device_1position) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jintArray arg3, jintArray arg4) { jint *lparg2=NULL; jint *lparg3=NULL; jint *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1device_1position_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_surface_get_device_position((GdkSurface *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4); + rc = (jlong)gdk_surface_get_device_position((GdkSurface *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); @@ -2240,12 +2196,12 @@ fail: #endif #ifndef NO__1gdk_1surface_1get_1display -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1surface_1get_1display) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1surface_1get_1display) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1display_FUNC); - rc = (jintLong)gdk_surface_get_display((GdkSurface *)arg0); + rc = (jlong)gdk_surface_get_display((GdkSurface *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1surface_1get_1display_FUNC); return rc; } @@ -2253,7 +2209,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1surface_1get_1display) #ifndef NO__1gdk_1surface_1get_1frame_1extents JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1get_1frame_1extents) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1frame_1extents_FUNC); @@ -2267,7 +2223,7 @@ fail: #ifndef NO__1gdk_1surface_1get_1height JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1height) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1height_FUNC); @@ -2279,7 +2235,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1height) #ifndef NO__1gdk_1surface_1get_1origin JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1origin) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -2298,7 +2254,7 @@ fail: #ifndef NO__1gdk_1surface_1get_1root_1origin JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1get_1root_1origin) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -2327,7 +2283,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1state) #ifndef NO__1gdk_1surface_1get_1user_1data JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1get_1user_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1) { jintLong *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1user_1data_FUNC); @@ -2341,7 +2297,7 @@ fail: #ifndef NO__1gdk_1surface_1get_1width JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1width_FUNC); @@ -2353,7 +2309,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1width) #ifndef NO__1gdk_1surface_1hide JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1hide) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1hide_FUNC); gdk_surface_hide((GdkSurface *)arg0); @@ -2363,7 +2319,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1hide) #ifndef NO__1gdk_1surface_1invalidate_1rect JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1invalidate_1rect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1invalidate_1rect_FUNC); @@ -2376,7 +2332,7 @@ fail: #ifndef NO__1gdk_1surface_1invalidate_1region JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1invalidate_1region) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1invalidate_1region_FUNC); gdk_surface_invalidate_region((GdkSurface *)arg0, (const cairo_region_t *)arg1); @@ -2386,7 +2342,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1invalidate_1region) #ifndef NO__1gdk_1surface_1lower JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1lower) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1lower_FUNC); gdk_surface_lower((GdkSurface *)arg0); @@ -2396,7 +2352,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1lower) #ifndef NO__1gdk_1surface_1move JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1move) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1move_FUNC); gdk_surface_move((GdkSurface *)arg0, arg1, arg2); @@ -2415,14 +2371,14 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1move_1resize) #endif #ifndef NO__1gdk_1surface_1new_1child -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1surface_1new_1child) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1surface_1new_1child) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1new_1child_FUNC); if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)gdk_surface_new_child((GdkSurface *)arg0, lparg1); + rc = (jlong)gdk_surface_new_child((GdkSurface *)arg0, lparg1); fail: GDK_NATIVE_EXIT(env, that, _1gdk_1surface_1new_1child_FUNC); return rc; @@ -2431,7 +2387,7 @@ fail: #ifndef NO__1gdk_1surface_1raise JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1raise) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1raise_FUNC); gdk_surface_raise((GdkSurface *)arg0); @@ -2441,7 +2397,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1raise) #ifndef NO__1gdk_1surface_1resize JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1resize) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1resize_FUNC); gdk_surface_resize((GdkSurface *)arg0, arg1, arg2); @@ -2451,7 +2407,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1resize) #ifndef NO__1gdk_1surface_1restack JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1restack) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1restack_FUNC); gdk_surface_restack((GdkSurface *)arg0, (GdkSurface *)arg1, (gboolean)arg2); @@ -2461,7 +2417,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1restack) #ifndef NO__1gdk_1surface_1set_1cursor JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1cursor) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1set_1cursor_FUNC); gdk_surface_set_cursor((GdkSurface *)arg0, (GdkCursor *)arg1); @@ -2471,7 +2427,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1cursor) #ifndef NO__1gdk_1surface_1set_1decorations JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1decorations) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1set_1decorations_FUNC); gdk_surface_set_decorations((GdkSurface *)arg0, (GdkWMDecoration)arg1); @@ -2481,7 +2437,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1decorations) #ifndef NO__1gdk_1surface_1set_1functions JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1functions) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1set_1functions_FUNC); gdk_surface_set_functions((GdkSurface *)arg0, (GdkWMFunction)arg1); @@ -2491,7 +2447,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1functions) #ifndef NO__1gdk_1surface_1set_1user_1data JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1user_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1set_1user_1data_FUNC); gdk_surface_set_user_data((GdkSurface *)arg0, (gpointer)arg1); @@ -2501,7 +2457,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1set_1user_1data) #ifndef NO__1gdk_1surface_1show JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1show) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1show_FUNC); gdk_surface_show((GdkSurface *)arg0); @@ -2511,7 +2467,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1show) #ifndef NO__1gdk_1surface_1show_1unraised JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1show_1unraised) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1show_1unraised_FUNC); gdk_surface_show_unraised((GdkSurface *)arg0); @@ -2521,7 +2477,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1show_1unraised) #ifndef NO__1gdk_1text_1property_1to_1utf8_1list_1for_1display JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1text_1property_1to_1utf8_1list_1for_1display) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLongArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jintLongArray arg5) { jintLong *lparg5=NULL; jint rc = 0; @@ -2536,12 +2492,12 @@ fail: #endif #ifndef NO__1gdk_1texture_1new_1for_1pixbuf -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1texture_1new_1for_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1texture_1new_1for_1pixbuf) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1texture_1new_1for_1pixbuf_FUNC); - rc = (jintLong)gdk_texture_new_for_pixbuf((GdkPixbuf *)arg0); + rc = (jlong)gdk_texture_new_for_pixbuf((GdkPixbuf *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1texture_1new_1for_1pixbuf_FUNC); return rc; } @@ -2560,14 +2516,14 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1unicode_1to_1keyval) #endif #ifndef NO__1gdk_1utf8_1to_1string_1target -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1utf8_1to_1string_1target) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1utf8_1to_1string_1target) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1string_1target_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_utf8_to_string_target((const gchar *)lparg0); + rc = (jlong)gdk_utf8_to_string_target((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GDK_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1string_1target_FUNC); @@ -2577,7 +2533,7 @@ fail: #ifndef NO__1gdk_1visual_1get_1depth JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1visual_1get_1depth) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1depth_FUNC); @@ -2588,12 +2544,12 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1visual_1get_1depth) #endif #ifndef NO__1gdk_1window_1create_1similar_1surface -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1create_1similar_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1create_1similar_1surface) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1create_1similar_1surface_FUNC); - rc = (jintLong)gdk_window_create_similar_surface((GdkWindow *)arg0, (cairo_content_t)arg1, arg2, arg3); + rc = (jlong)gdk_window_create_similar_surface((GdkWindow *)arg0, (cairo_content_t)arg1, arg2, arg3); GDK_NATIVE_EXIT(env, that, _1gdk_1window_1create_1similar_1surface_FUNC); return rc; } @@ -2601,7 +2557,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1create_1similar_1surface) #ifndef NO__1gdk_1window_1destroy JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1destroy_FUNC); gdk_window_destroy((GdkWindow *)arg0); @@ -2611,7 +2567,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1destroy) #ifndef NO__1gdk_1window_1focus JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1focus) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1focus_FUNC); gdk_window_focus((GdkWindow *)arg0, arg1); @@ -2620,30 +2576,30 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1focus) #endif #ifndef NO__1gdk_1window_1get_1children -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1children) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1get_1children) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1children_FUNC); - rc = (jintLong)gdk_window_get_children((GdkWindow *)arg0); + rc = (jlong)gdk_window_get_children((GdkWindow *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1window_1get_1children_FUNC); return rc; } #endif #ifndef NO__1gdk_1window_1get_1device_1position -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1device_1position) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1get_1device_1position) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jintArray arg3, jintArray arg4) { jint *lparg2=NULL; jint *lparg3=NULL; jint *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1device_1position_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)gdk_window_get_device_position((GdkWindow *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4); + rc = (jlong)gdk_window_get_device_position((GdkWindow *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); @@ -2654,12 +2610,12 @@ fail: #endif #ifndef NO__1gdk_1window_1get_1display -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1display) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1get_1display) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1display_FUNC); - rc = (jintLong)gdk_window_get_display((GdkWindow *)arg0); + rc = (jlong)gdk_window_get_display((GdkWindow *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1window_1get_1display_FUNC); return rc; } @@ -2667,7 +2623,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1display) #ifndef NO__1gdk_1window_1get_1events JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1events) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1events_FUNC); @@ -2679,7 +2635,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1events) #ifndef NO__1gdk_1window_1get_1frame_1extents JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1get_1frame_1extents) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1frame_1extents_FUNC); @@ -2693,7 +2649,7 @@ fail: #ifndef NO__1gdk_1window_1get_1height JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1height) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1height_FUNC); @@ -2705,7 +2661,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1height) #ifndef NO__1gdk_1window_1get_1origin JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1origin) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -2723,12 +2679,12 @@ fail: #endif #ifndef NO__1gdk_1window_1get_1parent -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1parent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1get_1parent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1parent_FUNC); - rc = (jintLong)gdk_window_get_parent((GdkWindow *)arg0); + rc = (jlong)gdk_window_get_parent((GdkWindow *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1window_1get_1parent_FUNC); return rc; } @@ -2736,7 +2692,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1parent) #ifndef NO__1gdk_1window_1get_1root_1origin JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1get_1root_1origin) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -2753,7 +2709,7 @@ fail: #ifndef NO__1gdk_1window_1get_1state JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1state) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1state_FUNC); @@ -2765,7 +2721,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1state) #ifndef NO__1gdk_1window_1get_1user_1data JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1get_1user_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1) { jintLong *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1user_1data_FUNC); @@ -2778,12 +2734,12 @@ fail: #endif #ifndef NO__1gdk_1window_1get_1visible_1region -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1visible_1region) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1get_1visible_1region) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1visible_1region_FUNC); - rc = (jintLong)gdk_window_get_visible_region((GdkWindow *)arg0); + rc = (jlong)gdk_window_get_visible_region((GdkWindow *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1window_1get_1visible_1region_FUNC); return rc; } @@ -2791,7 +2747,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1get_1visible_1region) #ifndef NO__1gdk_1window_1get_1width JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1width_FUNC); @@ -2803,7 +2759,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1width) #ifndef NO__1gdk_1window_1hide JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1hide) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1hide_FUNC); gdk_window_hide((GdkWindow *)arg0); @@ -2813,7 +2769,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1hide) #ifndef NO__1gdk_1window_1invalidate_1rect JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1invalidate_1rect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jboolean arg2) { GdkRectangle _arg1, *lparg1=NULL; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1rect_FUNC); @@ -2826,7 +2782,7 @@ fail: #ifndef NO__1gdk_1window_1invalidate_1region JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1invalidate_1region) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1region_FUNC); gdk_window_invalidate_region((GdkWindow *)arg0, (const cairo_region_t *)arg1, (gboolean)arg2); @@ -2836,7 +2792,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1invalidate_1region) #ifndef NO__1gdk_1window_1lower JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1lower) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1lower_FUNC); gdk_window_lower((GdkWindow *)arg0); @@ -2846,7 +2802,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1lower) #ifndef NO__1gdk_1window_1move JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1move) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1move_FUNC); gdk_window_move((GdkWindow *)arg0, arg1, arg2); @@ -2856,7 +2812,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1move) #ifndef NO__1gdk_1window_1move_1resize JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1move_1resize) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1move_1resize_FUNC); gdk_window_move_resize((GdkWindow *)arg0, arg1, arg2, arg3, arg4); @@ -2865,14 +2821,14 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1move_1resize) #endif #ifndef NO__1gdk_1window_1new -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1window_1new) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1new) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { GdkWindowAttr _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1window_1new_FUNC); if (arg1) if ((lparg1 = getGdkWindowAttrFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)gdk_window_new((GdkWindow *)arg0, lparg1, arg2); + rc = (jlong)gdk_window_new((GdkWindow *)arg0, lparg1, arg2); fail: GDK_NATIVE_EXIT(env, that, _1gdk_1window_1new_FUNC); return rc; @@ -2899,7 +2855,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1process_1all_1updates) #ifndef NO__1gdk_1window_1process_1updates JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1process_1updates) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1process_1updates_FUNC); /* @@ -2917,7 +2873,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1process_1updates) #ifndef NO__1gdk_1window_1raise JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1raise) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1raise_FUNC); gdk_window_raise((GdkWindow *)arg0); @@ -2927,7 +2883,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1raise) #ifndef NO__1gdk_1window_1resize JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1resize) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1resize_FUNC); gdk_window_resize((GdkWindow *)arg0, arg1, arg2); @@ -2937,7 +2893,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1resize) #ifndef NO__1gdk_1window_1restack JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1restack) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1restack_FUNC); gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2); @@ -2947,7 +2903,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1restack) #ifndef NO__1gdk_1window_1set_1background_1pattern JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1background_1pattern) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1set_1background_1pattern_FUNC); gdk_window_set_background_pattern((GdkWindow *)arg0, (cairo_pattern_t *)arg1); @@ -2957,7 +2913,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1background_1pattern) #ifndef NO__1gdk_1window_1set_1cursor JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1cursor) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1set_1cursor_FUNC); gdk_window_set_cursor((GdkWindow *)arg0, (GdkCursor *)arg1); @@ -2967,7 +2923,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1cursor) #ifndef NO__1gdk_1window_1set_1decorations JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1decorations) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1set_1decorations_FUNC); gdk_window_set_decorations((GdkWindow *)arg0, (GdkWMDecoration)arg1); @@ -2977,7 +2933,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1decorations) #ifndef NO__1gdk_1window_1set_1events JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1events) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1set_1events_FUNC); gdk_window_set_events((GdkWindow *)arg0, arg1); @@ -2987,7 +2943,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1events) #ifndef NO__1gdk_1window_1set_1functions JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1functions) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1set_1functions_FUNC); gdk_window_set_functions((GdkWindow *)arg0, (GdkWMFunction)arg1); @@ -2997,7 +2953,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1functions) #ifndef NO__1gdk_1window_1set_1override_1redirect JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1override_1redirect) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1set_1override_1redirect_FUNC); gdk_window_set_override_redirect((GdkWindow *)arg0, (gboolean)arg1); @@ -3007,7 +2963,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1override_1redirect) #ifndef NO__1gdk_1window_1set_1user_1data JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1user_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1set_1user_1data_FUNC); gdk_window_set_user_data((GdkWindow *)arg0, (gpointer)arg1); @@ -3017,7 +2973,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1set_1user_1data) #ifndef NO__1gdk_1window_1show JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1show) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1show_FUNC); gdk_window_show((GdkWindow *)arg0); @@ -3027,7 +2983,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1show) #ifndef NO__1gdk_1window_1show_1unraised JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1show_1unraised) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1window_1show_1unraised_FUNC); gdk_window_show_unraised((GdkWindow *)arg0); @@ -3037,7 +2993,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1show_1unraised) #ifndef NO__1gdk_1x11_1display_1error_1trap_1pop_1ignored JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1x11_1display_1error_1trap_1pop_1ignored) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1error_1trap_1pop_1ignored_FUNC); gdk_x11_display_error_trap_pop_ignored((GdkDisplay *)arg0); @@ -3047,7 +3003,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1x11_1display_1error_1trap_1pop_1ignored #ifndef NO__1gdk_1x11_1display_1error_1trap_1push JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1x11_1display_1error_1trap_1push) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1error_1trap_1push_FUNC); gdk_x11_display_error_trap_push((GdkDisplay *)arg0); @@ -3056,12 +3012,12 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1x11_1display_1error_1trap_1push) #endif #ifndef NO__1gdk_1x11_1display_1get_1xdisplay -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1display_1get_1xdisplay) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1display_1get_1xdisplay) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC); - rc = (jintLong)gdk_x11_display_get_xdisplay((GdkDisplay *)arg0); + rc = (jlong)gdk_x11_display_get_xdisplay((GdkDisplay *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC); return rc; } @@ -3069,7 +3025,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1display_1get_1xdisplay) #ifndef NO__1gdk_1x11_1display_1utf8_1to_1compound_1text JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1x11_1display_1utf8_1to_1compound_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2, jintArray arg3, jintLongArray arg4, jintArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintLongArray arg2, jintArray arg3, jintLongArray arg4, jintArray arg5) { jbyte *lparg1=NULL; jintLong *lparg2=NULL; @@ -3096,30 +3052,30 @@ fail: #endif #ifndef NO__1gdk_1x11_1get_1default_1xdisplay -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1get_1default_1xdisplay) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1get_1default_1xdisplay) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1get_1default_1xdisplay_FUNC); - rc = (jintLong)gdk_x11_get_default_xdisplay(); + rc = (jlong)gdk_x11_get_default_xdisplay(); GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1get_1default_1xdisplay_FUNC); return rc; } #endif #ifndef NO__1gdk_1x11_1screen_1get_1window_1manager_1name -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC); /* - rc = (jintLong)gdk_x11_screen_get_window_manager_name(arg0); + rc = (jlong)gdk_x11_screen_get_window_manager_name(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC); @@ -3128,18 +3084,18 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1 #endif #ifndef NO__1gdk_1x11_1screen_1lookup_1visual -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1screen_1lookup_1visual) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1screen_1lookup_1visual) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC); /* - rc = (jintLong)gdk_x11_screen_lookup_visual(arg0, (VisualID)arg1); + rc = (jlong)gdk_x11_screen_lookup_visual(arg0, (VisualID)arg1); */ { GDK_LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, VisualID))fp)(arg0, (VisualID)arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, VisualID))fp)(arg0, (VisualID)arg1); } } GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC); @@ -3148,42 +3104,42 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1screen_1lookup_1visual) #endif #ifndef NO__1gdk_1x11_1surface_1get_1xid -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1surface_1get_1xid) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1surface_1get_1xid) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1surface_1get_1xid_FUNC); - rc = (jintLong)gdk_x11_surface_get_xid((GdkSurface *)arg0); + rc = (jlong)gdk_x11_surface_get_xid((GdkSurface *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1surface_1get_1xid_FUNC); return rc; } #endif #ifndef NO__1gdk_1x11_1surface_1lookup_1for_1display -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1surface_1lookup_1for_1display) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1surface_1lookup_1for_1display) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1surface_1lookup_1for_1display_FUNC); - rc = (jintLong)gdk_x11_surface_lookup_for_display((GdkDisplay *)arg0, (Window)arg1); + rc = (jlong)gdk_x11_surface_lookup_for_display((GdkDisplay *)arg0, (Window)arg1); GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1surface_1lookup_1for_1display_FUNC); return rc; } #endif #ifndef NO__1gdk_1x11_1visual_1get_1xvisual -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1visual_1get_1xvisual) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1visual_1get_1xvisual) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC); /* - rc = (jintLong)gdk_x11_visual_get_xvisual(arg0); + rc = (jlong)gdk_x11_visual_get_xvisual(arg0); */ { GDK_LOAD_FUNCTION(fp, gdk_x11_visual_get_xvisual) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC); @@ -3192,24 +3148,24 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1visual_1get_1xvisual) #endif #ifndef NO__1gdk_1x11_1window_1get_1xid -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1window_1get_1xid) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1window_1get_1xid) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1window_1get_1xid_FUNC); - rc = (jintLong)gdk_x11_window_get_xid((GdkWindow *)arg0); + rc = (jlong)gdk_x11_window_get_xid((GdkWindow *)arg0); GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1window_1get_1xid_FUNC); return rc; } #endif #ifndef NO__1gdk_1x11_1window_1lookup_1for_1display -JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1x11_1window_1lookup_1for_1display) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1window_1lookup_1for_1display) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1window_1lookup_1for_1display_FUNC); - rc = (jintLong)gdk_x11_window_lookup_for_display((GdkDisplay *)arg0, (Window)arg1); + rc = (jlong)gdk_x11_window_lookup_for_display((GdkDisplay *)arg0, (Window)arg1); GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1window_1lookup_1for_1display_FUNC); return rc; } @@ -3230,24 +3186,24 @@ JNIEXPORT void JNICALL GDK_NATIVE(gdk_1threads_1leave) #endif #ifndef NO_GTK_1TYPE_1TEXT_1VIEW_1ACCESSIBLE -JNIEXPORT jintLong JNICALL GTK_NATIVE(GTK_1TYPE_1TEXT_1VIEW_1ACCESSIBLE) +JNIEXPORT jlong JNICALL GTK_NATIVE(GTK_1TYPE_1TEXT_1VIEW_1ACCESSIBLE) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, GTK_1TYPE_1TEXT_1VIEW_1ACCESSIBLE_FUNC); - rc = (jintLong)GTK_TYPE_TEXT_VIEW_ACCESSIBLE; + rc = (jlong)GTK_TYPE_TEXT_VIEW_ACCESSIBLE; GTK_NATIVE_EXIT(env, that, GTK_1TYPE_1TEXT_1VIEW_1ACCESSIBLE_FUNC); return rc; } #endif #ifndef NO_GTK_1WIDGET_1GET_1CLASS -JNIEXPORT jintLong JNICALL GTK_NATIVE(GTK_1WIDGET_1GET_1CLASS) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(GTK_1WIDGET_1GET_1CLASS) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, GTK_1WIDGET_1GET_1CLASS_FUNC); - rc = (jintLong)GTK_WIDGET_GET_CLASS((GtkWidget *)arg0); + rc = (jlong)GTK_WIDGET_GET_CLASS((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, GTK_1WIDGET_1GET_1CLASS_FUNC); return rc; } @@ -3398,24 +3354,24 @@ JNIEXPORT jint JNICALL GTK_NATIVE(GtkTreeIter_1sizeof) #endif #ifndef NO__1GET_1FUNCTION_1POINTER_1gtk_1false -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GET_1FUNCTION_1POINTER_1gtk_1false) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GET_1FUNCTION_1POINTER_1gtk_1false) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GET_1FUNCTION_1POINTER_1gtk_1false_FUNC); - rc = (jintLong)GET_FUNCTION_POINTER_gtk_false(); + rc = (jlong)GET_FUNCTION_POINTER_gtk_false(); GTK_NATIVE_EXIT(env, that, _1GET_1FUNCTION_1POINTER_1gtk_1false_FUNC); return rc; } #endif #ifndef NO__1GTK_1ACCESSIBLE -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1ACCESSIBLE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1ACCESSIBLE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1ACCESSIBLE_FUNC); - rc = (jintLong)GTK_ACCESSIBLE(arg0); + rc = (jlong)GTK_ACCESSIBLE(arg0); GTK_NATIVE_EXIT(env, that, _1GTK_1ACCESSIBLE_FUNC); return rc; } @@ -3423,7 +3379,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1ACCESSIBLE) #ifndef NO__1GTK_1IS_1ACCEL_1LABEL JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1ACCEL_1LABEL) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1ACCEL_1LABEL_FUNC); @@ -3435,7 +3391,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1ACCEL_1LABEL) #ifndef NO__1GTK_1IS_1BUTTON JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1BUTTON) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1BUTTON_FUNC); @@ -3447,7 +3403,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1BUTTON) #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1PIXBUF JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC); @@ -3459,7 +3415,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF) #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TEXT JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC); @@ -3471,7 +3427,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT) #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TOGGLE JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC); @@ -3483,7 +3439,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE) #ifndef NO__1GTK_1IS_1CONTAINER JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CONTAINER) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CONTAINER_FUNC); @@ -3495,7 +3451,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CONTAINER) #ifndef NO__1GTK_1IS_1LABEL JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1LABEL) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1LABEL_FUNC); @@ -3507,7 +3463,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1LABEL) #ifndef NO__1GTK_1IS_1MENU_1ITEM JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1MENU_1ITEM) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC); @@ -3519,7 +3475,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1MENU_1ITEM) #ifndef NO__1GTK_1IS_1PLUG JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1PLUG) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1PLUG_FUNC); @@ -3531,7 +3487,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1PLUG) #ifndef NO__1GTK_1IS_1SCROLLED_1WINDOW JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1SCROLLED_1WINDOW) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1SCROLLED_1WINDOW_FUNC); @@ -3543,7 +3499,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1SCROLLED_1WINDOW) #ifndef NO__1GTK_1IS_1WINDOW JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1WINDOW) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1WINDOW_FUNC); @@ -3554,110 +3510,110 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1WINDOW) #endif #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC); - rc = (jintLong)GTK_TYPE_CELL_RENDERER_PIXBUF; + rc = (jlong)GTK_TYPE_CELL_RENDERER_PIXBUF; GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC); return rc; } #endif #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TEXT -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC); - rc = (jintLong)GTK_TYPE_CELL_RENDERER_TEXT; + rc = (jlong)GTK_TYPE_CELL_RENDERER_TEXT; GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC); return rc; } #endif #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC); - rc = (jintLong)GTK_TYPE_CELL_RENDERER_TOGGLE; + rc = (jlong)GTK_TYPE_CELL_RENDERER_TOGGLE; GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC); return rc; } #endif #ifndef NO__1GTK_1TYPE_1IM_1MULTICONTEXT -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1IM_1MULTICONTEXT) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1TYPE_1IM_1MULTICONTEXT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1IM_1MULTICONTEXT_FUNC); - rc = (jintLong)GTK_TYPE_IM_MULTICONTEXT; + rc = (jlong)GTK_TYPE_IM_MULTICONTEXT; GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1IM_1MULTICONTEXT_FUNC); return rc; } #endif #ifndef NO__1GTK_1TYPE_1MENU -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1MENU) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1TYPE_1MENU) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1MENU_FUNC); - rc = (jintLong)GTK_TYPE_MENU; + rc = (jlong)GTK_TYPE_MENU; GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1MENU_FUNC); return rc; } #endif #ifndef NO__1GTK_1TYPE_1WIDGET -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1WIDGET) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1TYPE_1WIDGET) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1WIDGET_FUNC); - rc = (jintLong)GTK_TYPE_WIDGET; + rc = (jlong)GTK_TYPE_WIDGET; GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1WIDGET_FUNC); return rc; } #endif #ifndef NO__1GTK_1TYPE_1WINDOW -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1WINDOW) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1TYPE_1WINDOW) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1WINDOW_FUNC); - rc = (jintLong)GTK_TYPE_WINDOW; + rc = (jlong)GTK_TYPE_WINDOW; GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1WINDOW_FUNC); return rc; } #endif #ifndef NO__1gtk_1accel_1group_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1accel_1group_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1accel_1group_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1group_1new_FUNC); - rc = (jintLong)gtk_accel_group_new(); + rc = (jlong)gtk_accel_group_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1accel_1group_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1accel_1label_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1accel_1label_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1accel_1label_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_accel_label_new((const gchar *)lparg0); + rc = (jlong)gtk_accel_label_new((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1accel_1label_1new_FUNC); @@ -3667,7 +3623,7 @@ fail: #ifndef NO__1gtk_1accel_1label_1set_1accel JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1accel_1label_1set_1accel) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_FUNC); /* @@ -3685,7 +3641,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1accel_1label_1set_1accel) #ifndef NO__1gtk_1accel_1label_1set_1accel_1widget JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC); gtk_accel_label_set_accel_widget((GtkAccelLabel *)arg0, (GtkWidget *)arg1); @@ -3707,7 +3663,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1accelerator_1get_1default_1mod_1mask) #ifndef NO__1gtk_1accelerator_1parse JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1accelerator_1parse) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -3723,12 +3679,12 @@ fail: #endif #ifndef NO__1gtk_1accessible_1get_1widget -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1accessible_1get_1widget) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1accessible_1get_1widget) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1accessible_1get_1widget_FUNC); - rc = (jintLong)gtk_accessible_get_widget((GtkAccessible *)arg0); + rc = (jlong)gtk_accessible_get_widget((GtkAccessible *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1accessible_1get_1widget_FUNC); return rc; } @@ -3736,7 +3692,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1accessible_1get_1widget) #ifndef NO__1gtk_1adjustment_1configure JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1configure) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) { GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1configure_FUNC); gtk_adjustment_configure((GtkAdjustment *)arg0, arg1, arg2, arg3, arg4, arg5, arg6); @@ -3746,7 +3702,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1configure) #ifndef NO__1gtk_1adjustment_1get_1lower JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1lower) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1lower_FUNC); @@ -3758,7 +3714,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1lower) #ifndef NO__1gtk_1adjustment_1get_1page_1increment JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1page_1increment) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1increment_FUNC); @@ -3770,7 +3726,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1page_1increment) #ifndef NO__1gtk_1adjustment_1get_1page_1size JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1page_1size) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1size_FUNC); @@ -3782,7 +3738,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1page_1size) #ifndef NO__1gtk_1adjustment_1get_1step_1increment JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1step_1increment) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1step_1increment_FUNC); @@ -3794,7 +3750,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1step_1increment) #ifndef NO__1gtk_1adjustment_1get_1upper JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1upper) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1upper_FUNC); @@ -3806,7 +3762,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1upper) #ifndef NO__1gtk_1adjustment_1get_1value JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1value) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1value_FUNC); @@ -3817,12 +3773,12 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1value) #endif #ifndef NO__1gtk_1adjustment_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1adjustment_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1adjustment_1new) (JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1new_FUNC); - rc = (jintLong)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5); + rc = (jlong)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5); GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1new_FUNC); return rc; } @@ -3830,7 +3786,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1adjustment_1new) #ifndef NO__1gtk_1adjustment_1set_1page_1increment JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1page_1increment) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1page_1increment_FUNC); gtk_adjustment_set_page_increment((GtkAdjustment *)arg0, (gdouble)arg1); @@ -3840,7 +3796,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1page_1increment) #ifndef NO__1gtk_1adjustment_1set_1step_1increment JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1step_1increment) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1step_1increment_FUNC); gtk_adjustment_set_step_increment((GtkAdjustment *)arg0, (gdouble)arg1); @@ -3850,7 +3806,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1step_1increment) #ifndef NO__1gtk_1adjustment_1set_1value JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1value) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1value_FUNC); gtk_adjustment_set_value((GtkAdjustment *)arg0, (gdouble)arg1); @@ -3860,7 +3816,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1value) #ifndef NO__1gtk_1adjustment_1value_1changed JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1value_1changed) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1value_1changed_FUNC); /* @@ -3877,12 +3833,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1value_1changed) #endif #ifndef NO__1gtk_1bin_1get_1child -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1bin_1get_1child) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1bin_1get_1child) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1bin_1get_1child_FUNC); - rc = (jintLong)gtk_bin_get_child((GtkBin *)arg0); + rc = (jlong)gtk_bin_get_child((GtkBin *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1bin_1get_1child_FUNC); return rc; } @@ -3890,7 +3846,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1bin_1get_1child) #ifndef NO__1gtk_1border_1free JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1border_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1border_1free_FUNC); gtk_border_free((GtkBorder *)arg0); @@ -3899,29 +3855,22 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1border_1free) #endif #ifndef NO__1gtk_1box_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1box_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1box_1new) (JNIEnv *env, jclass that, jint arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1box_1new_FUNC); - rc = (jintLong)gtk_box_new((GtkOrientation)arg0, (gint)arg1); + rc = (jlong)gtk_box_new((GtkOrientation)arg0, (gint)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1box_1new_FUNC); return rc; } #endif -#if (!defined(NO__1gtk_1box_1pack_1end__II) && !defined(JNI64)) || (!defined(NO__1gtk_1box_1pack_1end__JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO__1gtk_1box_1pack_1end__JJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1box_1pack_1end__II_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1box_1pack_1end__JJ_FUNC); -#endif /* gtk_box_pack_end((GtkBox *)arg0, (GtkWidget *)arg1); */ @@ -3931,26 +3880,15 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__JJ)(JNIEnv *env, jclass ((void (CALLING_CONVENTION*)(GtkBox *, GtkWidget *))fp)((GtkBox *)arg0, (GtkWidget *)arg1); } } -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1box_1pack_1end__II_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1box_1pack_1end__JJ_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1box_1pack_1end__IIZZI) && !defined(JNI64)) || (!defined(NO__1gtk_1box_1pack_1end__JJZZI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__IIZZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__JJZZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4) -#endif +#ifndef NO__1gtk_1box_1pack_1end__JJZZI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__JJZZI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2, jboolean arg3, jint arg4) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1box_1pack_1end__IIZZI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1box_1pack_1end__JJZZI_FUNC); -#endif /* gtk_box_pack_end((GtkBox *)arg0, (GtkWidget *)arg1, (gboolean)arg2, (gboolean)arg3, (guint)arg4); */ @@ -3960,17 +3898,13 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end__JJZZI)(JNIEnv *env, jcl ((void (CALLING_CONVENTION*)(GtkBox *, GtkWidget *, gboolean, gboolean, guint))fp)((GtkBox *)arg0, (GtkWidget *)arg1, (gboolean)arg2, (gboolean)arg3, (guint)arg4); } } -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1box_1pack_1end__IIZZI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1box_1pack_1end__JJZZI_FUNC); -#endif } #endif #ifndef NO__1gtk_1box_1reorder_1child JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1reorder_1child) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1box_1reorder_1child_FUNC); gtk_box_reorder_child((GtkBox *)arg0, (GtkWidget *)arg1, (gint)arg2); @@ -3978,18 +3912,11 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1reorder_1child) } #endif -#if (!defined(NO__1gtk_1box_1set_1child_1packing__III) && !defined(JNI64)) || (!defined(NO__1gtk_1box_1set_1child_1packing__JJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO__1gtk_1box_1set_1child_1packing__JJI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__JJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing__III_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing__JJI_FUNC); -#endif /* gtk_box_set_child_packing((GtkBox *)arg0, (GtkWidget *)arg1, arg2); */ @@ -3999,26 +3926,15 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__JJI)(JNIEnv * ((void (CALLING_CONVENTION*)(GtkBox *, GtkWidget *, jint))fp)((GtkBox *)arg0, (GtkWidget *)arg1, arg2); } } -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1box_1set_1child_1packing__III_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1box_1set_1child_1packing__JJI_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1box_1set_1child_1packing__IIZZII) && !defined(JNI64)) || (!defined(NO__1gtk_1box_1set_1child_1packing__JJZZII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__IIZZII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__JJZZII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5) -#endif +#ifndef NO__1gtk_1box_1set_1child_1packing__JJZZII +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__JJZZII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing__IIZZII_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing__JJZZII_FUNC); -#endif /* gtk_box_set_child_packing((GtkBox *)arg0, (GtkWidget *)arg1, arg2, arg3, arg4, arg5); */ @@ -4028,17 +3944,13 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing__JJZZII)(JNIEn ((void (CALLING_CONVENTION*)(GtkBox *, GtkWidget *, jboolean, jboolean, jint, jint))fp)((GtkBox *)arg0, (GtkWidget *)arg1, arg2, arg3, arg4, arg5); } } -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1box_1set_1child_1packing__IIZZII_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1box_1set_1child_1packing__JJZZII_FUNC); -#endif } #endif #ifndef NO__1gtk_1box_1set_1homogeneous JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1homogeneous) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1homogeneous_FUNC); gtk_box_set_homogeneous((GtkBox *)arg0, (gboolean)arg1); @@ -4048,7 +3960,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1homogeneous) #ifndef NO__1gtk_1box_1set_1spacing JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1spacing) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1spacing_FUNC); gtk_box_set_spacing((GtkBox *)arg0, arg1); @@ -4058,7 +3970,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1spacing) #ifndef NO__1gtk_1button_1clicked JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1button_1clicked) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1button_1clicked_FUNC); gtk_button_clicked((GtkButton *)arg0); @@ -4067,12 +3979,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1button_1clicked) #endif #ifndef NO__1gtk_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1button_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1button_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1button_1new_FUNC); - rc = (jintLong)gtk_button_new(); + rc = (jlong)gtk_button_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1button_1new_FUNC); return rc; } @@ -4080,7 +3992,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1button_1new) #ifndef NO__1gtk_1button_1set_1image JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1button_1set_1image) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1button_1set_1image_FUNC); /* @@ -4098,7 +4010,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1button_1set_1image) #ifndef NO__1gtk_1calendar_1clear_1marks JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1clear_1marks) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1clear_1marks_FUNC); gtk_calendar_clear_marks((GtkCalendar *)arg0); @@ -4108,7 +4020,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1clear_1marks) #ifndef NO__1gtk_1calendar_1get_1date JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1get_1date) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2, jintArray arg3) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -4128,7 +4040,7 @@ fail: #ifndef NO__1gtk_1calendar_1mark_1day JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1mark_1day) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1mark_1day_FUNC); gtk_calendar_mark_day((GtkCalendar *)arg0, (guint)arg1); @@ -4137,12 +4049,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1mark_1day) #endif #ifndef NO__1gtk_1calendar_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1calendar_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1calendar_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1new_FUNC); - rc = (jintLong)gtk_calendar_new(); + rc = (jlong)gtk_calendar_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1new_FUNC); return rc; } @@ -4150,7 +4062,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1calendar_1new) #ifndef NO__1gtk_1calendar_1select_1day JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1select_1day) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1day_FUNC); gtk_calendar_select_day((GtkCalendar *)arg0, (guint)arg1); @@ -4160,7 +4072,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1select_1day) #ifndef NO__1gtk_1calendar_1select_1month JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1select_1month) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1month_FUNC); gtk_calendar_select_month((GtkCalendar *)arg0, (guint)arg1, (guint)arg2); @@ -4170,7 +4082,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1select_1month) #ifndef NO__1gtk_1calendar_1set_1display_1options JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1set_1display_1options) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1set_1display_1options_FUNC); gtk_calendar_set_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); @@ -4180,7 +4092,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1set_1display_1options) #ifndef NO__1gtk_1cell_1layout_1clear JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1clear) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1clear_FUNC); gtk_cell_layout_clear((GtkCellLayout *)arg0); @@ -4189,12 +4101,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1clear) #endif #ifndef NO__1gtk_1cell_1layout_1get_1cells -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1get_1cells) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1get_1cells) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1get_1cells_FUNC); - rc = (jintLong)gtk_cell_layout_get_cells((GtkCellLayout *)arg0); + rc = (jlong)gtk_cell_layout_get_cells((GtkCellLayout *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1get_1cells_FUNC); return rc; } @@ -4202,7 +4114,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1get_1cells) #ifndef NO__1gtk_1cell_1layout_1pack_1start JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1pack_1start) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC); gtk_cell_layout_pack_start((GtkCellLayout *)arg0, (GtkCellRenderer *)arg1, arg2); @@ -4212,7 +4124,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1pack_1start) #ifndef NO__1gtk_1cell_1layout_1set_1attributes JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1set_1attributes) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jint arg3, jlong arg4) { jbyte *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1set_1attributes_FUNC); @@ -4226,7 +4138,7 @@ fail: #ifndef NO__1gtk_1cell_1renderer_1get_1fixed_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1fixed_1size) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -4243,7 +4155,7 @@ fail: #ifndef NO__1gtk_1cell_1renderer_1get_1padding JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1padding) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -4260,7 +4172,7 @@ fail: #ifndef NO__1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintArray arg3, jintArray arg4) { jint *lparg3=NULL; jint *lparg4=NULL; @@ -4277,7 +4189,7 @@ fail: #ifndef NO__1gtk_1cell_1renderer_1get_1preferred_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1size) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3) { GtkRequisition _arg2, *lparg2=NULL; GtkRequisition _arg3, *lparg3=NULL; @@ -4293,12 +4205,12 @@ fail: #endif #ifndef NO__1gtk_1cell_1renderer_1pixbuf_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC); - rc = (jintLong)gtk_cell_renderer_pixbuf_new(); + rc = (jlong)gtk_cell_renderer_pixbuf_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC); return rc; } @@ -4306,7 +4218,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new) #ifndef NO__1gtk_1cell_1renderer_1set_1fixed_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1set_1fixed_1size) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1set_1fixed_1size_FUNC); gtk_cell_renderer_set_fixed_size((GtkCellRenderer *)arg0, (gint)arg1, (gint)arg2); @@ -4315,24 +4227,24 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1set_1fixed_1size) #endif #ifndef NO__1gtk_1cell_1renderer_1text_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1text_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1text_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC); - rc = (jintLong)gtk_cell_renderer_text_new(); + rc = (jlong)gtk_cell_renderer_text_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1cell_1renderer_1toggle_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1toggle_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1toggle_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC); - rc = (jintLong)gtk_cell_renderer_toggle_new(); + rc = (jlong)gtk_cell_renderer_toggle_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC); return rc; } @@ -4340,7 +4252,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1toggle_1new) #ifndef NO__1gtk_1cell_1view_1set_1fit_1model JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1view_1set_1fit_1model) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1view_1set_1fit_1model_FUNC); gtk_cell_view_set_fit_model((GtkCellView *)arg0, (gboolean)arg1); @@ -4349,12 +4261,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1view_1set_1fit_1model) #endif #ifndef NO__1gtk_1check_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1button_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1check_1button_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1check_1button_1new_FUNC); - rc = (jintLong)gtk_check_button_new(); + rc = (jlong)gtk_check_button_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1check_1button_1new_FUNC); return rc; } @@ -4362,7 +4274,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1button_1new) #ifndef NO__1gtk_1check_1menu_1item_1get_1active JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1get_1active) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC); @@ -4373,12 +4285,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1get_1active) #endif #ifndef NO__1gtk_1check_1menu_1item_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_FUNC); - rc = (jintLong)gtk_check_menu_item_new(); + rc = (jlong)gtk_check_menu_item_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_FUNC); return rc; } @@ -4386,7 +4298,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1new) #ifndef NO__1gtk_1check_1menu_1item_1set_1active JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1set_1active) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC); gtk_check_menu_item_set_active((GtkCheckMenuItem *)arg0, (gboolean)arg1); @@ -4395,12 +4307,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1set_1active) #endif #ifndef NO__1gtk_1check_1version -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1version) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1check_1version) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1check_1version_FUNC); - rc = (jintLong)gtk_check_version(arg0, arg1, arg2); + rc = (jlong)gtk_check_version(arg0, arg1, arg2); GTK_NATIVE_EXIT(env, that, _1gtk_1check_1version_FUNC); return rc; } @@ -4408,7 +4320,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1version) #ifndef NO__1gtk_1clipboard_1clear JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1clear) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1clear_FUNC); gtk_clipboard_clear((GtkClipboard *)arg0); @@ -4417,12 +4329,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1clear) #endif #ifndef NO__1gtk_1clipboard_1get -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1clipboard_1get) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1clipboard_1get) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1get_FUNC); - rc = (jintLong)gtk_clipboard_get((GdkAtom)arg0); + rc = (jlong)gtk_clipboard_get((GdkAtom)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1get_FUNC); return rc; } @@ -4430,7 +4342,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1clipboard_1get) #ifndef NO__1gtk_1clipboard_1set_1can_1store JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1set_1can_1store) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1can_1store_FUNC); gtk_clipboard_set_can_store((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (gint)arg2); @@ -4440,7 +4352,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1set_1can_1store) #ifndef NO__1gtk_1clipboard_1set_1with_1owner JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1clipboard_1set_1with_1owner) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1with_1owner_FUNC); @@ -4452,7 +4364,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1clipboard_1set_1with_1owner) #ifndef NO__1gtk_1clipboard_1store JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1store) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1store_FUNC); gtk_clipboard_store((GtkClipboard *)arg0); @@ -4461,12 +4373,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1store) #endif #ifndef NO__1gtk_1clipboard_1wait_1for_1contents -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1clipboard_1wait_1for_1contents) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1clipboard_1wait_1for_1contents) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC); - rc = (jintLong)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1); + rc = (jlong)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC); return rc; } @@ -4474,7 +4386,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1clipboard_1wait_1for_1contents) #ifndef NO__1gtk_1color_1chooser_1add_1palette JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1add_1palette) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4) { GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1add_1palette_FUNC); gtk_color_chooser_add_palette((GtkColorChooser *)arg0, (GtkOrientation)arg1, (gint)arg2, arg3, (GdkRGBA *)arg4); @@ -4483,14 +4395,14 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1add_1palette) #endif #ifndef NO__1gtk_1color_1chooser_1dialog_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1dialog_1new) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1dialog_1new) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1dialog_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_color_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); + rc = (jlong)gtk_color_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1dialog_1new_FUNC); @@ -4500,7 +4412,7 @@ fail: #ifndef NO__1gtk_1color_1chooser_1get_1rgba JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1get_1rgba) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRGBA _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1get_1rgba_FUNC); @@ -4514,7 +4426,7 @@ fail: #ifndef NO__1gtk_1color_1chooser_1get_1use_1alpha JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1get_1use_1alpha) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1get_1use_1alpha_FUNC); @@ -4526,7 +4438,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1get_1use_1alpha) #ifndef NO__1gtk_1color_1chooser_1set_1rgba JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1set_1rgba) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRGBA _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1set_1rgba_FUNC); @@ -4540,7 +4452,7 @@ fail: #ifndef NO__1gtk_1color_1chooser_1set_1use_1alpha JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1set_1use_1alpha) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1set_1use_1alpha_FUNC); gtk_color_chooser_set_use_alpha((GtkColorChooser *)arg0, (gboolean)arg1); @@ -4550,7 +4462,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1set_1use_1alpha) #ifndef NO__1gtk_1combo_1box_1get_1active JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1active) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1active_FUNC); @@ -4561,12 +4473,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1active) #endif #ifndef NO__1gtk_1combo_1box_1get_1model -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1model) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1model) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1model_FUNC); - rc = (jintLong)gtk_combo_box_get_model((GtkComboBox *)arg0); + rc = (jlong)gtk_combo_box_get_model((GtkComboBox *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1model_FUNC); return rc; } @@ -4574,7 +4486,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1model) #ifndef NO__1gtk_1combo_1box_1get_1wrap_1width JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1wrap_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1wrap_1width_FUNC); @@ -4586,7 +4498,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1wrap_1width) #ifndef NO__1gtk_1combo_1box_1popdown JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1popdown) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popdown_FUNC); gtk_combo_box_popdown((GtkComboBox *)arg0); @@ -4596,7 +4508,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1popdown) #ifndef NO__1gtk_1combo_1box_1popup JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1popup) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popup_FUNC); gtk_combo_box_popup((GtkComboBox *)arg0); @@ -4606,7 +4518,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1popup) #ifndef NO__1gtk_1combo_1box_1set_1active JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1active) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1active_FUNC); gtk_combo_box_set_active((GtkComboBox *)arg0, (gint)arg1); @@ -4616,7 +4528,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1active) #ifndef NO__1gtk_1combo_1box_1set_1focus_1on_1click JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC); /* @@ -4634,7 +4546,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click) #ifndef NO__1gtk_1combo_1box_1set_1wrap_1width JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1wrap_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC); gtk_combo_box_set_wrap_width((GtkComboBox *)arg0, (gint)arg1); @@ -4644,7 +4556,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1wrap_1width) #ifndef NO__1gtk_1combo_1box_1text_1insert JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1insert) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jbyteArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyteArray arg2, jbyteArray arg3) { jbyte *lparg2=NULL; jbyte *lparg3=NULL; @@ -4660,24 +4572,24 @@ fail: #endif #ifndef NO__1gtk_1combo_1box_1text_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1new_FUNC); - rc = (jintLong)gtk_combo_box_text_new(); + rc = (jlong)gtk_combo_box_text_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1combo_1box_1text_1new_1with_1entry -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1new_1with_1entry) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1new_1with_1entry) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1new_1with_1entry_FUNC); - rc = (jintLong)gtk_combo_box_text_new_with_entry(); + rc = (jlong)gtk_combo_box_text_new_with_entry(); GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1new_1with_1entry_FUNC); return rc; } @@ -4685,7 +4597,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1new_1with_1entry) #ifndef NO__1gtk_1combo_1box_1text_1remove JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1remove) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1remove_FUNC); gtk_combo_box_text_remove((GtkComboBoxText *)arg0, arg1); @@ -4695,7 +4607,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1remove) #ifndef NO__1gtk_1combo_1box_1text_1remove_1all JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1remove_1all) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1remove_1all_FUNC); gtk_combo_box_text_remove_all((GtkComboBoxText *)arg0); @@ -4705,7 +4617,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1remove_1all) #ifndef NO__1gtk_1container_1add JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1add) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1container_1add_FUNC); gtk_container_add((GtkContainer *)arg0, (GtkWidget *)arg1); @@ -4715,7 +4627,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1add) #ifndef NO__1gtk_1container_1forall JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1forall) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1container_1forall_FUNC); gtk_container_forall((GtkContainer *)arg0, (GtkCallback)arg1, (gpointer)arg2); @@ -4725,7 +4637,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1forall) #ifndef NO__1gtk_1container_1get_1border_1width JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1container_1get_1border_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1container_1get_1border_1width_FUNC); @@ -4736,12 +4648,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1container_1get_1border_1width) #endif #ifndef NO__1gtk_1container_1get_1children -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1container_1get_1children) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1container_1get_1children) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1container_1get_1children_FUNC); - rc = (jintLong)gtk_container_get_children((GtkContainer *)arg0); + rc = (jlong)gtk_container_get_children((GtkContainer *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1container_1get_1children_FUNC); return rc; } @@ -4749,7 +4661,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1container_1get_1children) #ifndef NO__1gtk_1container_1propagate_1draw JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1propagate_1draw) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1container_1propagate_1draw_FUNC); gtk_container_propagate_draw((GtkContainer *)arg0, (GtkWidget *)arg1, (cairo_t *)arg2); @@ -4759,7 +4671,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1propagate_1draw) #ifndef NO__1gtk_1container_1remove JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1remove) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1container_1remove_FUNC); gtk_container_remove((GtkContainer *)arg0, (GtkWidget *)arg1); @@ -4769,7 +4681,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1remove) #ifndef NO__1gtk_1container_1set_1border_1width JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1set_1border_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1container_1set_1border_1width_FUNC); gtk_container_set_border_width((GtkContainer *)arg0, (guint)arg1); @@ -4778,16 +4690,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1set_1border_1width) #endif #ifndef NO__1gtk_1css_1provider_1get_1named -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1get_1named) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1get_1named) (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1) { jbyte *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1get_1named_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_css_provider_get_named((const gchar *)lparg0, (const gchar *)lparg1); + rc = (jlong)gtk_css_provider_get_named((const gchar *)lparg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); @@ -4796,94 +4708,72 @@ fail: } #endif -#if (!defined(NO__1gtk_1css_1provider_1load_1from_1data__I_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1css_1provider_1load_1from_1data__J_3BJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1css_1provider_1load_1from_1data__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1css_1provider_1load_1from_1data__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) -#endif +#ifndef NO__1gtk_1css_1provider_1load_1from_1data__J_3BJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1css_1provider_1load_1from_1data__J_3BJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1load_1from_1data__I_3BI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1load_1from_1data__J_3BJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; gtk_css_provider_load_from_data((GtkCssProvider *)arg0, (const gchar *)lparg1, (gssize)arg2); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1load_1from_1data__I_3BI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1load_1from_1data__J_3BJ_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1css_1provider_1load_1from_1data__I_3BI_3I) && !defined(JNI64)) || (!defined(NO__1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1css_1provider_1load_1from_1data__I_3BI_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLongArray arg3) -#else -JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLongArray arg3) -#endif +#ifndef NO__1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J +JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlongArray arg3) { jbyte *lparg1=NULL; - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jboolean rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1load_1from_1data__I_3BI_3I_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jboolean)gtk_css_provider_load_from_data((GtkCssProvider *)arg0, (const gchar *)lparg1, (gssize)arg2, (GError **)lparg3); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1load_1from_1data__I_3BI_3I_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J_FUNC); -#endif return rc; } #endif #ifndef NO__1gtk_1css_1provider_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1new_FUNC); - rc = (jintLong)gtk_css_provider_new(); + rc = (jlong)gtk_css_provider_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1css_1provider_1to_1string -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1to_1string) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1to_1string) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1to_1string_FUNC); - rc = (jintLong)gtk_css_provider_to_string((GtkCssProvider *)arg0); + rc = (jlong)gtk_css_provider_to_string((GtkCssProvider *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1to_1string_FUNC); return rc; } #endif #ifndef NO__1gtk_1dialog_1add_1button -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1dialog_1add_1button) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1dialog_1add_1button) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1dialog_1add_1button_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2); + rc = (jlong)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1dialog_1add_1button_FUNC); @@ -4893,7 +4783,7 @@ fail: #ifndef NO__1gtk_1dialog_1run JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1dialog_1run) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1dialog_1run_FUNC); @@ -4903,63 +4793,41 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1dialog_1run) } #endif -#if (!defined(NO__1gtk_1drag_1begin_1with_1coordinates__IIIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1drag_1begin_1with_1coordinates__JJJIII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1begin_1with_1coordinates__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5) -#else -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1begin_1with_1coordinates__JJJIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5) -#endif +#ifndef NO__1gtk_1drag_1begin_1with_1coordinates__JJIIJII +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1drag_1begin_1with_1coordinates__JJIIJII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4, jint arg5, jint arg6) { - jintLong rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_1with_1coordinates__IIIIII_FUNC); -#else - GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_1with_1coordinates__JJJIII_FUNC); -#endif - rc = (jintLong)gtk_drag_begin_with_coordinates((GtkWidget *)arg0, (GdkDevice *)arg1, (GdkContentFormats *)arg2, (GdkDragAction)arg3, (gint)arg4, (gint)arg5); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_1with_1coordinates__IIIIII_FUNC); -#else - GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_1with_1coordinates__JJJIII_FUNC); -#endif - return rc; -} -#endif - -#if (!defined(NO__1gtk_1drag_1begin_1with_1coordinates__IIIIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1drag_1begin_1with_1coordinates__JJIIJII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1begin_1with_1coordinates__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4, jint arg5, jint arg6) -#else -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1begin_1with_1coordinates__JJIIJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4, jint arg5, jint arg6) -#endif -{ - jintLong rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_1with_1coordinates__IIIIIII_FUNC); -#else + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_1with_1coordinates__JJIIJII_FUNC); -#endif /* - rc = (jintLong)gtk_drag_begin_with_coordinates((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4, (gint)arg5, (gint)arg6); + rc = (jlong)gtk_drag_begin_with_coordinates((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4, (gint)arg5, (gint)arg6); */ { GTK_LOAD_FUNCTION(fp, gtk_drag_begin_with_coordinates) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *, GtkTargetList *, GdkDragAction, gint, GdkEvent *, gint, gint))fp)((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4, (gint)arg5, (gint)arg6); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkWidget *, GtkTargetList *, GdkDragAction, gint, GdkEvent *, gint, gint))fp)((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4, (gint)arg5, (gint)arg6); } } -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_1with_1coordinates__IIIIIII_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_1with_1coordinates__JJIIJII_FUNC); + return rc; +} #endif + +#ifndef NO__1gtk_1drag_1begin_1with_1coordinates__JJJIII +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1drag_1begin_1with_1coordinates__JJJIII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5) +{ + jlong rc = 0; + GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_1with_1coordinates__JJJIII_FUNC); + rc = (jlong)gtk_drag_begin_with_coordinates((GtkWidget *)arg0, (GdkDevice *)arg1, (GdkContentFormats *)arg2, (GdkDragAction)arg3, (gint)arg4, (gint)arg5); + GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_1with_1coordinates__JJJIII_FUNC); return rc; } #endif #ifndef NO__1gtk_1drag_1check_1threshold JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1drag_1check_1threshold) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1check_1threshold_FUNC); @@ -4970,12 +4838,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1drag_1check_1threshold) #endif #ifndef NO__1gtk_1drag_1dest_1find_1target -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1find_1target) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1find_1target) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1find_1target_FUNC); - rc = (jintLong)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2); + rc = (jlong)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2); GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1find_1target_FUNC); return rc; } @@ -4983,7 +4851,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1find_1target) #ifndef NO__1gtk_1drag_1dest_1set JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1set) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3, jint arg4) { GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1set_FUNC); gtk_drag_dest_set((GtkWidget *)arg0, (GtkDestDefaults)arg1, (const GtkTargetEntry *)arg2, (gint)arg3, (GdkDragAction)arg4); @@ -4993,7 +4861,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1set) #ifndef NO__1gtk_1drag_1dest_1unset JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1unset) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1unset_FUNC); gtk_drag_dest_unset((GtkWidget *)arg0); @@ -5003,7 +4871,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1unset) #ifndef NO__1gtk_1drag_1finish JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1finish) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jboolean arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1, jboolean arg2, jint arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1finish_FUNC); gtk_drag_finish((GdkDragContext *)arg0, (gboolean)arg1, (gboolean)arg2, (guint32)arg3); @@ -5011,51 +4879,29 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1finish) } #endif -#if (!defined(NO__1gtk_1drag_1get_1data__III) && !defined(JNI64)) || (!defined(NO__1gtk_1drag_1get_1data__JJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1get_1data__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1get_1data__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO__1gtk_1drag_1get_1data__JJJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1get_1data__JJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data__III_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data__JJJ_FUNC); -#endif gtk_drag_get_data((GtkWidget *)arg0, (GdkDrop *)arg1, (GdkAtom)arg2); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1get_1data__III_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1get_1data__JJJ_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1drag_1get_1data__IIII) && !defined(JNI64)) || (!defined(NO__1gtk_1drag_1get_1data__JJJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1get_1data__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1get_1data__JJJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3) -#endif +#ifndef NO__1gtk_1drag_1get_1data__JJJI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1get_1data__JJJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data__IIII_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data__JJJI_FUNC); -#endif gtk_drag_get_data((GtkWidget *)arg0, (GdkDragContext *)arg1, (GdkAtom)arg2, (guint32)arg3); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1get_1data__IIII_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1get_1data__JJJI_FUNC); -#endif } #endif #ifndef NO__1gtk_1drag_1set_1icon_1surface JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1set_1icon_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1surface_FUNC); gtk_drag_set_icon_surface((GdkDragContext *)arg0, (cairo_surface_t *)arg1); @@ -5065,7 +4911,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1set_1icon_1surface) #ifndef NO__1gtk_1editable_1copy_1clipboard JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1copy_1clipboard) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1copy_1clipboard_FUNC); gtk_editable_copy_clipboard((GtkEditable *)arg0); @@ -5075,7 +4921,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1copy_1clipboard) #ifndef NO__1gtk_1editable_1cut_1clipboard JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1cut_1clipboard) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1cut_1clipboard_FUNC); gtk_editable_cut_clipboard((GtkEditable *)arg0); @@ -5085,7 +4931,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1cut_1clipboard) #ifndef NO__1gtk_1editable_1delete_1selection JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1delete_1selection) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1selection_FUNC); gtk_editable_delete_selection((GtkEditable *)arg0); @@ -5095,7 +4941,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1delete_1selection) #ifndef NO__1gtk_1editable_1delete_1text JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1delete_1text) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1text_FUNC); gtk_editable_delete_text((GtkEditable *)arg0, (gint)arg1, (gint)arg2); @@ -5105,7 +4951,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1delete_1text) #ifndef NO__1gtk_1editable_1get_1editable JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1editable_1get_1editable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1editable_FUNC); @@ -5117,7 +4963,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1editable_1get_1editable) #ifndef NO__1gtk_1editable_1get_1position JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1editable_1get_1position) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1position_FUNC); @@ -5129,7 +4975,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1editable_1get_1position) #ifndef NO__1gtk_1editable_1get_1selection_1bounds JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1editable_1get_1selection_1bounds) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -5148,7 +4994,7 @@ fail: #ifndef NO__1gtk_1editable_1insert_1text JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1insert_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jintArray arg3) { jbyte *lparg1=NULL; jint *lparg3=NULL; @@ -5165,7 +5011,7 @@ fail: #ifndef NO__1gtk_1editable_1paste_1clipboard JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1paste_1clipboard) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1paste_1clipboard_FUNC); gtk_editable_paste_clipboard((GtkEditable *)arg0); @@ -5175,7 +5021,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1paste_1clipboard) #ifndef NO__1gtk_1editable_1select_1region JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1select_1region) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1select_1region_FUNC); gtk_editable_select_region((GtkEditable *)arg0, (gint)arg1, (gint)arg2); @@ -5185,7 +5031,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1select_1region) #ifndef NO__1gtk_1editable_1set_1editable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1set_1editable) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1editable_FUNC); gtk_editable_set_editable((GtkEditable *)arg0, (gboolean)arg1); @@ -5195,7 +5041,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1set_1editable) #ifndef NO__1gtk_1editable_1set_1position JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1set_1position) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1position_FUNC); gtk_editable_set_position((GtkEditable *)arg0, (gint)arg1); @@ -5205,7 +5051,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1set_1position) #ifndef NO__1gtk_1entry_1get_1icon_1area JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1get_1icon_1area) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GdkRectangle _arg2, *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1icon_1area_FUNC); @@ -5219,7 +5065,7 @@ fail: #ifndef NO__1gtk_1entry_1get_1invisible_1char JNIEXPORT jchar JNICALL GTK_NATIVE(_1gtk_1entry_1get_1invisible_1char) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jchar rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC); @@ -5230,12 +5076,12 @@ JNIEXPORT jchar JNICALL GTK_NATIVE(_1gtk_1entry_1get_1invisible_1char) #endif #ifndef NO__1gtk_1entry_1get_1layout -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1layout) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1layout) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_FUNC); - rc = (jintLong)gtk_entry_get_layout((GtkEntry *)arg0); + rc = (jlong)gtk_entry_get_layout((GtkEntry *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_FUNC); return rc; } @@ -5243,7 +5089,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1layout) #ifndef NO__1gtk_1entry_1get_1layout_1offsets JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1get_1layout_1offsets) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -5260,7 +5106,7 @@ fail: #ifndef NO__1gtk_1entry_1get_1max_1length JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1get_1max_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1max_1length_FUNC); @@ -5271,12 +5117,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1get_1max_1length) #endif #ifndef NO__1gtk_1entry_1get_1text -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1text) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1text) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1text_FUNC); - rc = (jintLong)gtk_entry_get_text((GtkEntry *)arg0); + rc = (jlong)gtk_entry_get_text((GtkEntry *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1text_FUNC); return rc; } @@ -5284,7 +5130,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1text) #ifndef NO__1gtk_1entry_1get_1visibility JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1entry_1get_1visibility) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1visibility_FUNC); @@ -5295,12 +5141,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1entry_1get_1visibility) #endif #ifndef NO__1gtk_1entry_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1entry_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1new_FUNC); - rc = (jintLong)gtk_entry_new(); + rc = (jlong)gtk_entry_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1new_FUNC); return rc; } @@ -5308,7 +5154,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1new) #ifndef NO__1gtk_1entry_1set_1alignment JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1alignment) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1alignment_FUNC); gtk_entry_set_alignment((GtkEntry *)arg0, (gfloat)arg1); @@ -5318,7 +5164,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1alignment) #ifndef NO__1gtk_1entry_1set_1has_1frame JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1has_1frame) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1has_1frame_FUNC); gtk_entry_set_has_frame((GtkEntry *)arg0, (gboolean)arg1); @@ -5328,7 +5174,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1has_1frame) #ifndef NO__1gtk_1entry_1set_1icon_1activatable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1icon_1activatable) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1icon_1activatable_FUNC); gtk_entry_set_icon_activatable((GtkEntry *)arg0, (GtkEntryIconPosition)arg1, (gboolean)arg2); @@ -5338,7 +5184,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1icon_1activatable) #ifndef NO__1gtk_1entry_1set_1icon_1from_1icon_1name JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1icon_1from_1icon_1name) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyteArray arg2) { jbyte *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1icon_1from_1icon_1name_FUNC); @@ -5352,7 +5198,7 @@ fail: #ifndef NO__1gtk_1entry_1set_1icon_1sensitive JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1icon_1sensitive) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1icon_1sensitive_FUNC); gtk_entry_set_icon_sensitive((GtkEntry *)arg0, (GtkEntryIconPosition)arg1, (gboolean)arg2); @@ -5362,7 +5208,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1icon_1sensitive) #ifndef NO__1gtk_1entry_1set_1invisible_1char JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1invisible_1char) - (JNIEnv *env, jclass that, jintLong arg0, jchar arg1) + (JNIEnv *env, jclass that, jlong arg0, jchar arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC); gtk_entry_set_invisible_char((GtkEntry *)arg0, (gint)arg1); @@ -5372,7 +5218,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1invisible_1char) #ifndef NO__1gtk_1entry_1set_1max_1length JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1max_1length) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1max_1length_FUNC); gtk_entry_set_max_length((GtkEntry *)arg0, (gint)arg1); @@ -5382,7 +5228,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1max_1length) #ifndef NO__1gtk_1entry_1set_1placeholder_1text JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1placeholder_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1placeholder_1text_FUNC); @@ -5396,7 +5242,7 @@ fail: #ifndef NO__1gtk_1entry_1set_1tabs JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1tabs) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1tabs_FUNC); gtk_entry_set_tabs((GtkEntry *)arg0, (PangoTabArray *)arg1); @@ -5406,7 +5252,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1tabs) #ifndef NO__1gtk_1entry_1set_1text JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1text_FUNC); @@ -5420,7 +5266,7 @@ fail: #ifndef NO__1gtk_1entry_1set_1visibility JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1visibility) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1visibility_FUNC); gtk_entry_set_visibility((GtkEntry *)arg0, (gboolean)arg1); @@ -5430,7 +5276,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1visibility) #ifndef NO__1gtk_1entry_1set_1width_1chars JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1width_1chars) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1width_1chars_FUNC); gtk_entry_set_width_chars((GtkEntry *)arg0, (gint)arg1); @@ -5440,7 +5286,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1width_1chars) #ifndef NO__1gtk_1entry_1text_1index_1to_1layout_1index JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC); @@ -5452,7 +5298,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index) #ifndef NO__1gtk_1enumerate_1printers JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1enumerate_1printers) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jintLong arg1, jlong arg2, jboolean arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC); gtk_enumerate_printers((GtkPrinterFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3); @@ -5461,18 +5307,18 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1enumerate_1printers) #endif #ifndef NO__1gtk_1event_1box_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1box_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1event_1box_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1event_1box_1new_FUNC); /* - rc = (jintLong)gtk_event_box_new(); + rc = (jlong)gtk_event_box_new(); */ { GTK_LOAD_FUNCTION(fp, gtk_event_box_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } GTK_NATIVE_EXIT(env, that, _1gtk_1event_1box_1new_FUNC); @@ -5481,18 +5327,18 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1box_1new) #endif #ifndef NO__1gtk_1event_1controller_1get_1widget -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1get_1widget) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1get_1widget) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1get_1widget_FUNC); /* - rc = (jintLong)gtk_event_controller_get_widget(arg0); + rc = (jlong)gtk_event_controller_get_widget(arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_event_controller_get_widget) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1get_1widget_FUNC); @@ -5502,7 +5348,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1get_1widget) #ifndef NO__1gtk_1event_1controller_1handle_1event JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1handle_1event) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1handle_1event_FUNC); /* @@ -5511,7 +5357,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1handle_1event) { GTK_LOAD_FUNCTION(fp, gtk_event_controller_handle_event) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1handle_1event_FUNC); @@ -5519,36 +5365,36 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1handle_1event) #endif #ifndef NO__1gtk_1event_1controller_1key_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1key_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1key_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1key_1new_FUNC); - rc = (jintLong)gtk_event_controller_key_new(); + rc = (jlong)gtk_event_controller_key_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1key_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1event_1controller_1motion_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1motion_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1motion_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1motion_1new_FUNC); - rc = (jintLong)gtk_event_controller_motion_new(); + rc = (jlong)gtk_event_controller_motion_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1motion_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1event_1controller_1scroll_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1scroll_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1scroll_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1scroll_1new_FUNC); - rc = (jintLong)gtk_event_controller_scroll_new(arg0); + rc = (jlong)gtk_event_controller_scroll_new(arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1scroll_1new_FUNC); return rc; } @@ -5556,7 +5402,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1controller_1scroll_1new) #ifndef NO__1gtk_1event_1controller_1set_1propagation_1phase JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1set_1propagation_1phase) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC); /* @@ -5565,7 +5411,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1set_1propagation_1ph { GTK_LOAD_FUNCTION(fp, gtk_event_controller_set_propagation_phase) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC); @@ -5574,7 +5420,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1set_1propagation_1ph #ifndef NO__1gtk_1expander_1get_1expanded JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1expander_1get_1expanded) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1expanded_FUNC); @@ -5585,14 +5431,14 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1expander_1get_1expanded) #endif #ifndef NO__1gtk_1expander_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1expander_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1expander_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_expander_new((const gchar *)lparg0); + rc = (jlong)gtk_expander_new((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1expander_1new_FUNC); @@ -5602,7 +5448,7 @@ fail: #ifndef NO__1gtk_1expander_1set_1expanded JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1expander_1set_1expanded) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1expanded_FUNC); gtk_expander_set_expanded((GtkExpander *)arg0, arg1); @@ -5612,7 +5458,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1expander_1set_1expanded) #ifndef NO__1gtk_1expander_1set_1label_1widget JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1expander_1set_1label_1widget) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_1widget_FUNC); gtk_expander_set_label_widget((GtkExpander *)arg0, (GtkWidget *)arg1); @@ -5622,7 +5468,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1expander_1set_1label_1widget) #ifndef NO__1gtk_1file_1chooser_1add_1filter JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1add_1filter) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC); gtk_file_chooser_add_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1); @@ -5630,145 +5476,123 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1add_1filter) } #endif -#if (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BIIIIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BIIIIIII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7) -#else -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7) -#endif +#ifndef NO__1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlong arg5, jint arg6, jlong arg7) { jbyte *lparg0=NULL; - jintLong rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BIIIIIII_FUNC); -#else + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_file_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)arg3, arg4, arg5, arg6, (const gchar *)NULL); + rc = (jlong)gtk_file_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)arg3, arg4, arg5, arg6, (const gchar *)NULL); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BIIIIIII_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII) && !defined(JNI64)) || (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLong arg7) -#else -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLong arg7) -#endif +#ifndef NO__1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jlong arg7) { jbyte *lparg0=NULL; jbyte *lparg3=NULL; jbyte *lparg5=NULL; - jintLong rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII_FUNC); -#else + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_file_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, arg4, lparg5, arg6, (const gchar *)NULL); + rc = (jlong)gtk_file_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, arg4, lparg5, arg6, (const gchar *)NULL); fail: if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, JNI_ABORT); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC); -#endif return rc; } #endif #ifndef NO__1gtk_1file_1chooser_1get_1filename -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filename) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filename) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC); - rc = (jintLong)gtk_file_chooser_get_filename((GtkFileChooser *)arg0); + rc = (jlong)gtk_file_chooser_get_filename((GtkFileChooser *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC); return rc; } #endif #ifndef NO__1gtk_1file_1chooser_1get_1filenames -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filenames) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filenames) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC); - rc = (jintLong)gtk_file_chooser_get_filenames((GtkFileChooser *)arg0); + rc = (jlong)gtk_file_chooser_get_filenames((GtkFileChooser *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC); return rc; } #endif #ifndef NO__1gtk_1file_1chooser_1get_1filter -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filter) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filter) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC); - rc = (jintLong)gtk_file_chooser_get_filter((GtkFileChooser *)arg0); + rc = (jlong)gtk_file_chooser_get_filter((GtkFileChooser *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC); return rc; } #endif #ifndef NO__1gtk_1file_1chooser_1get_1uri -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC); - rc = (jintLong)gtk_file_chooser_get_uri((GtkFileChooser *)arg0); + rc = (jlong)gtk_file_chooser_get_uri((GtkFileChooser *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC); return rc; } #endif #ifndef NO__1gtk_1file_1chooser_1get_1uris -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1uris) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1uris) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC); - rc = (jintLong)gtk_file_chooser_get_uris((GtkFileChooser *)arg0); + rc = (jlong)gtk_file_chooser_get_uris((GtkFileChooser *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC); return rc; } #endif #ifndef NO__1gtk_1file_1chooser_1native_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1native_1new) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1native_1new) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4) { jbyte *lparg0=NULL; jbyte *lparg3=NULL; jbyte *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1native_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; /* - rc = (jintLong)gtk_file_chooser_native_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, (const gchar *)lparg4); + rc = (jlong)gtk_file_chooser_native_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, (const gchar *)lparg4); */ { GTK_LOAD_FUNCTION(fp, gtk_file_chooser_native_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkWindow *, jint, const gchar *, const gchar *))fp)((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, (const gchar *)lparg4); + rc = (jlong)((jlong (CALLING_CONVENTION*)(const gchar *, GtkWindow *, jint, const gchar *, const gchar *))fp)((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, (const gchar *)lparg4); } } fail: @@ -5782,7 +5606,7 @@ fail: #ifndef NO__1gtk_1file_1chooser_1set_1current_1folder JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC); gtk_file_chooser_set_current_folder((GtkFileChooser *)arg0, (const gchar *)arg1); @@ -5792,7 +5616,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder) #ifndef NO__1gtk_1file_1chooser_1set_1current_1folder_1uri JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC); @@ -5806,7 +5630,7 @@ fail: #ifndef NO__1gtk_1file_1chooser_1set_1current_1name JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1current_1name) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1name_FUNC); @@ -5820,7 +5644,7 @@ fail: #ifndef NO__1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC); gtk_file_chooser_set_do_overwrite_confirmation((GtkFileChooser *)arg0, (gboolean)arg1); @@ -5830,7 +5654,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1conf #ifndef NO__1gtk_1file_1chooser_1set_1extra_1widget JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC); gtk_file_chooser_set_extra_widget((GtkFileChooser *)arg0, (GtkWidget *)arg1); @@ -5840,7 +5664,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget) #ifndef NO__1gtk_1file_1chooser_1set_1filename JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1filename) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC); gtk_file_chooser_set_filename((GtkFileChooser *)arg0, (const gchar *)arg1); @@ -5850,7 +5674,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1filename) #ifndef NO__1gtk_1file_1chooser_1set_1filter JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1filter) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC); gtk_file_chooser_set_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1); @@ -5860,7 +5684,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1filter) #ifndef NO__1gtk_1file_1chooser_1set_1local_1only JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1local_1only) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1local_1only_FUNC); gtk_file_chooser_set_local_only((GtkFileChooser *)arg0, (gboolean)arg1); @@ -5870,7 +5694,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1local_1only) #ifndef NO__1gtk_1file_1chooser_1set_1select_1multiple JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC); gtk_file_chooser_set_select_multiple((GtkFileChooser *)arg0, (gboolean)arg1); @@ -5880,7 +5704,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple) #ifndef NO__1gtk_1file_1chooser_1set_1uri JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1uri_FUNC); @@ -5894,7 +5718,7 @@ fail: #ifndef NO__1gtk_1file_1filter_1add_1pattern JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1filter_1add_1pattern) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC); @@ -5907,24 +5731,24 @@ fail: #endif #ifndef NO__1gtk_1file_1filter_1get_1name -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1filter_1get_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1filter_1get_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1get_1name_FUNC); - rc = (jintLong)gtk_file_filter_get_name((GtkFileFilter *)arg0); + rc = (jlong)gtk_file_filter_get_name((GtkFileFilter *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1get_1name_FUNC); return rc; } #endif #ifndef NO__1gtk_1file_1filter_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1filter_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1file_1filter_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1new_FUNC); - rc = (jintLong)gtk_file_filter_new(); + rc = (jlong)gtk_file_filter_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1new_FUNC); return rc; } @@ -5932,7 +5756,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1filter_1new) #ifndef NO__1gtk_1file_1filter_1set_1name JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1filter_1set_1name) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1set_1name_FUNC); @@ -5945,14 +5769,14 @@ fail: #endif #ifndef NO__1gtk_1font_1chooser_1dialog_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1dialog_1new) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1dialog_1new) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1dialog_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_font_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); + rc = (jlong)gtk_font_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1dialog_1new_FUNC); @@ -5961,12 +5785,12 @@ fail: #endif #ifndef NO__1gtk_1font_1chooser_1get_1font -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1get_1font) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1get_1font) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1get_1font_FUNC); - rc = (jintLong)gtk_font_chooser_get_font((GtkFontChooser *)arg0); + rc = (jlong)gtk_font_chooser_get_font((GtkFontChooser *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1get_1font_FUNC); return rc; } @@ -5974,7 +5798,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1get_1font) #ifndef NO__1gtk_1font_1chooser_1set_1font JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1set_1font) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1set_1font_FUNC); @@ -5987,26 +5811,26 @@ fail: #endif #ifndef NO__1gtk_1frame_1get_1label_1widget -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1frame_1get_1label_1widget) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1frame_1get_1label_1widget) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1get_1label_1widget_FUNC); - rc = (jintLong)gtk_frame_get_label_widget((GtkFrame *)arg0); + rc = (jlong)gtk_frame_get_label_widget((GtkFrame *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1frame_1get_1label_1widget_FUNC); return rc; } #endif #ifndef NO__1gtk_1frame_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1frame_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1frame_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_frame_new((const gchar *)lparg0); + rc = (jlong)gtk_frame_new((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1frame_1new_FUNC); @@ -6016,7 +5840,7 @@ fail: #ifndef NO__1gtk_1frame_1set_1label_1widget JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1frame_1set_1label_1widget) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_1widget_FUNC); gtk_frame_set_label_widget((GtkFrame *)arg0, (GtkWidget *)arg1); @@ -6026,7 +5850,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1frame_1set_1label_1widget) #ifndef NO__1gtk_1frame_1set_1shadow_1type JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1frame_1set_1shadow_1type) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC); gtk_frame_set_shadow_type((GtkFrame *)arg0, (GtkShadowType)arg1); @@ -6036,7 +5860,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1frame_1set_1shadow_1type) #ifndef NO__1gtk_1gesture_1drag_1get_1offset JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1get_1offset) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -6049,7 +5873,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1get_1offset) { GTK_LOAD_FUNCTION(fp, gtk_gesture_drag_get_offset) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2); } } fail: @@ -6061,7 +5885,7 @@ fail: #ifndef NO__1gtk_1gesture_1drag_1get_1start_1point JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1get_1start_1point) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -6075,7 +5899,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1get_1start_1point) { GTK_LOAD_FUNCTION(fp, gtk_gesture_drag_get_start_point) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2); } } fail: @@ -6087,18 +5911,18 @@ fail: #endif #ifndef NO__1gtk_1gesture_1drag_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1new_FUNC); /* - rc = (jintLong)gtk_gesture_drag_new((GtkWidget *)arg0); + rc = (jlong)gtk_gesture_drag_new((GtkWidget *)arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_drag_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1new_FUNC); @@ -6107,18 +5931,18 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1new) #endif #ifndef NO__1gtk_1gesture_1get_1last_1event -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1event) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1event) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1last_1event_FUNC); /* - rc = (jintLong)gtk_gesture_get_last_event(arg0, arg1); + rc = (jlong)gtk_gesture_get_last_event(arg0, arg1); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_get_last_event) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1last_1event_FUNC); @@ -6127,18 +5951,18 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1event) #endif #ifndef NO__1gtk_1gesture_1get_1last_1updated_1sequence -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1updated_1sequence) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1updated_1sequence) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1last_1updated_1sequence_FUNC); /* - rc = (jintLong)gtk_gesture_get_last_updated_sequence(arg0); + rc = (jlong)gtk_gesture_get_last_updated_sequence(arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_get_last_updated_sequence) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1last_1updated_1sequence_FUNC); @@ -6148,7 +5972,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1updated_1sequen #ifndef NO__1gtk_1gesture_1get_1point JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1point) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdoubleArray arg2, jdoubleArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdoubleArray arg2, jdoubleArray arg3) { jdouble *lparg2=NULL; jdouble *lparg3=NULL; @@ -6162,7 +5986,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1point) { GTK_LOAD_FUNCTION(fp, gtk_gesture_get_point) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jdouble *, jdouble *))fp)(arg0, arg1, lparg2, lparg3); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong, jlong, jdouble *, jdouble *))fp)(arg0, arg1, lparg2, lparg3); } } fail: @@ -6174,18 +5998,18 @@ fail: #endif #ifndef NO__1gtk_1gesture_1get_1sequences -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1sequences) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1sequences) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1sequences_FUNC); /* - rc = (jintLong)gtk_gesture_get_sequences(arg0); + rc = (jlong)gtk_gesture_get_sequences(arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_get_sequences) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1sequences_FUNC); @@ -6195,7 +6019,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1sequences) #ifndef NO__1gtk_1gesture_1group JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1group) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1group_FUNC); /* @@ -6204,7 +6028,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1group) { GTK_LOAD_FUNCTION(fp, gtk_gesture_group) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1group_FUNC); @@ -6213,7 +6037,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1group) #ifndef NO__1gtk_1gesture_1is_1recognized JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1is_1recognized) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1is_1recognized_FUNC); @@ -6223,7 +6047,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1is_1recognized) { GTK_LOAD_FUNCTION(fp, gtk_gesture_is_recognized) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1is_1recognized_FUNC); @@ -6232,30 +6056,30 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1is_1recognized) #endif #ifndef NO__1gtk_1gesture_1multi_1press_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1multi_1press_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1multi_1press_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1multi_1press_1new_FUNC); - rc = (jintLong)gtk_gesture_multi_press_new(); + rc = (jlong)gtk_gesture_multi_press_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1multi_1press_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1gesture_1pan_1get_1orientation -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1get_1orientation) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1get_1orientation) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1get_1orientation_FUNC); /* - rc = (jintLong)gtk_gesture_pan_get_orientation(arg0); + rc = (jlong)gtk_gesture_pan_get_orientation(arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_get_orientation) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1get_1orientation_FUNC); @@ -6265,7 +6089,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1get_1orientation) #ifndef NO__1gtk_1gesture_1pan_1new JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1new) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1new_FUNC); /* @@ -6274,7 +6098,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1new) { GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_new) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1new_FUNC); @@ -6283,7 +6107,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1new) #ifndef NO__1gtk_1gesture_1pan_1set_1orientation JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1set_1orientation) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1set_1orientation_FUNC); /* @@ -6292,7 +6116,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1set_1orientation) { GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_set_orientation) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1set_1orientation_FUNC); @@ -6301,7 +6125,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1set_1orientation) #ifndef NO__1gtk_1gesture_1rotate_1get_1angle_1delta JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1get_1angle_1delta) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1rotate_1get_1angle_1delta_FUNC); @@ -6311,7 +6135,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1get_1angle_1delta) { GTK_LOAD_FUNCTION(fp, gtk_gesture_rotate_get_angle_delta) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1rotate_1get_1angle_1delta_FUNC); @@ -6320,18 +6144,18 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1get_1angle_1delta) #endif #ifndef NO__1gtk_1gesture_1rotate_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1rotate_1new_FUNC); /* - rc = (jintLong)gtk_gesture_rotate_new(arg0); + rc = (jlong)gtk_gesture_rotate_new(arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_rotate_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1rotate_1new_FUNC); @@ -6341,7 +6165,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1new) #ifndef NO__1gtk_1gesture_1single_1set_1button JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1single_1set_1button) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1single_1set_1button_FUNC); /* @@ -6350,7 +6174,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1single_1set_1button) { GTK_LOAD_FUNCTION(fp, gtk_gesture_single_set_button) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1single_1set_1button_FUNC); @@ -6359,7 +6183,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1single_1set_1button) #ifndef NO__1gtk_1gesture_1swipe_1get_1velocity JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1swipe_1get_1velocity) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2) { jdouble *lparg1=NULL; jdouble *lparg2=NULL; @@ -6373,7 +6197,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1swipe_1get_1velocity) { GTK_LOAD_FUNCTION(fp, gtk_gesture_swipe_get_velocity) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2); } } fail: @@ -6385,18 +6209,18 @@ fail: #endif #ifndef NO__1gtk_1gesture_1swipe_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1swipe_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1swipe_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1swipe_1new_FUNC); /* - rc = (jintLong)gtk_gesture_swipe_new(arg0); + rc = (jlong)gtk_gesture_swipe_new(arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_swipe_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1swipe_1new_FUNC); @@ -6406,7 +6230,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1swipe_1new) #ifndef NO__1gtk_1gesture_1zoom_1get_1scale_1delta JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1get_1scale_1delta) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1zoom_1get_1scale_1delta_FUNC); @@ -6416,7 +6240,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1get_1scale_1delta) { GTK_LOAD_FUNCTION(fp, gtk_gesture_zoom_get_scale_delta) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1zoom_1get_1scale_1delta_FUNC); @@ -6425,18 +6249,18 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1get_1scale_1delta) #endif #ifndef NO__1gtk_1gesture_1zoom_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1zoom_1new_FUNC); /* - rc = (jintLong)gtk_gesture_zoom_new(arg0); + rc = (jlong)gtk_gesture_zoom_new(arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_gesture_zoom_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1zoom_1new_FUNC); @@ -6445,12 +6269,12 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1new) #endif #ifndef NO__1gtk_1get_1current_1event -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1get_1current_1event) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1get_1current_1event) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_FUNC); - rc = (jintLong)gtk_get_current_event(); + rc = (jlong)gtk_get_current_event(); GTK_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_FUNC); return rc; } @@ -6473,24 +6297,24 @@ fail: #endif #ifndef NO__1gtk_1get_1default_1language -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1get_1default_1language) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1get_1default_1language) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1get_1default_1language_FUNC); - rc = (jintLong)gtk_get_default_language(); + rc = (jlong)gtk_get_default_language(); GTK_NATIVE_EXIT(env, that, _1gtk_1get_1default_1language_FUNC); return rc; } #endif #ifndef NO__1gtk_1get_1event_1widget -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1get_1event_1widget) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1get_1event_1widget) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1get_1event_1widget_FUNC); - rc = (jintLong)gtk_get_event_widget((GdkEvent *)arg0); + rc = (jlong)gtk_get_event_widget((GdkEvent *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1get_1event_1widget_FUNC); return rc; } @@ -6534,7 +6358,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1get_1minor_1version) #ifndef NO__1gtk_1grab_1add JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1grab_1add) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1grab_1add_FUNC); gtk_grab_add((GtkWidget *)arg0); @@ -6543,12 +6367,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1grab_1add) #endif #ifndef NO__1gtk_1grab_1get_1current -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1grab_1get_1current) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1grab_1get_1current) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1grab_1get_1current_FUNC); - rc = (jintLong)gtk_grab_get_current(); + rc = (jlong)gtk_grab_get_current(); GTK_NATIVE_EXIT(env, that, _1gtk_1grab_1get_1current_FUNC); return rc; } @@ -6556,7 +6380,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1grab_1get_1current) #ifndef NO__1gtk_1grab_1remove JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1grab_1remove) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1grab_1remove_FUNC); gtk_grab_remove((GtkWidget *)arg0); @@ -6585,42 +6409,42 @@ fail: #endif #ifndef NO__1gtk_1icon_1info_1load_1icon -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1info_1load_1icon) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1icon_1info_1load_1icon) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { - jintLong *lparg1=NULL; - jintLong rc = 0; + jlong *lparg1=NULL; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1info_1load_1icon_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_icon_info_load_icon((GtkIconInfo *)arg0, (GError **)lparg1); + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + rc = (jlong)gtk_icon_info_load_icon((GtkIconInfo *)arg0, (GError **)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1info_1load_1icon_FUNC); return rc; } #endif #ifndef NO__1gtk_1icon_1theme_1get_1default -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1get_1default) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1get_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1get_1default_FUNC); - rc = (jintLong)gtk_icon_theme_get_default(); + rc = (jlong)gtk_icon_theme_get_default(); GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1get_1default_FUNC); return rc; } #endif #ifndef NO__1gtk_1icon_1theme_1load_1icon -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1load_1icon) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jintLong arg4) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1load_1icon) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jint arg3, jlong arg4) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1load_1icon_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_icon_theme_load_icon((GtkIconTheme *)arg0, (const gchar *)lparg1, (gint)arg2, (GtkIconLookupFlags)arg3, (GError **)arg4); + rc = (jlong)gtk_icon_theme_load_icon((GtkIconTheme *)arg0, (const gchar *)lparg1, (gint)arg2, (GtkIconLookupFlags)arg3, (GError **)arg4); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1load_1icon_FUNC); @@ -6629,12 +6453,12 @@ fail: #endif #ifndef NO__1gtk_1icon_1theme_1lookup_1by_1gicon -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1lookup_1by_1gicon) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1lookup_1by_1gicon) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1lookup_1by_1gicon_FUNC); - rc = (jintLong)gtk_icon_theme_lookup_by_gicon((GtkIconTheme *)arg0, (GIcon *)arg1, (gint)arg2, (GtkIconLookupFlags)arg3); + rc = (jlong)gtk_icon_theme_lookup_by_gicon((GtkIconTheme *)arg0, (GIcon *)arg1, (gint)arg2, (GtkIconLookupFlags)arg3); GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1lookup_1by_1gicon_FUNC); return rc; } @@ -6642,7 +6466,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1lookup_1by_1gicon) #ifndef NO__1gtk_1im_1context_1filter_1keypress JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1im_1context_1filter_1keypress) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC); @@ -6654,7 +6478,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1im_1context_1filter_1keypress) #ifndef NO__1gtk_1im_1context_1focus_1in JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1focus_1in) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1in_FUNC); gtk_im_context_focus_in((GtkIMContext *)arg0); @@ -6664,7 +6488,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1focus_1in) #ifndef NO__1gtk_1im_1context_1focus_1out JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1focus_1out) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1out_FUNC); gtk_im_context_focus_out((GtkIMContext *)arg0); @@ -6674,7 +6498,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1focus_1out) #ifndef NO__1gtk_1im_1context_1get_1preedit_1string JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1get_1preedit_1string) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintLongArray arg2, jintArray arg3) { jintLong *lparg1=NULL; jintLong *lparg2=NULL; @@ -6693,12 +6517,12 @@ fail: #endif #ifndef NO__1gtk_1im_1context_1get_1type -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1im_1context_1get_1type) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1im_1context_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1type_FUNC); - rc = (jintLong)gtk_im_context_get_type(); + rc = (jlong)gtk_im_context_get_type(); GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1type_FUNC); return rc; } @@ -6706,7 +6530,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1im_1context_1get_1type) #ifndef NO__1gtk_1im_1context_1reset JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1reset) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1reset_FUNC); gtk_im_context_reset((GtkIMContext *)arg0); @@ -6716,7 +6540,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1reset) #ifndef NO__1gtk_1im_1context_1set_1client_1window JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1set_1client_1window) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC); gtk_im_context_set_client_window((GtkIMContext *)arg0, (GdkWindow *)arg1); @@ -6726,7 +6550,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1set_1client_1window) #ifndef NO__1gtk_1im_1context_1set_1cursor_1location JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1set_1cursor_1location) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC); @@ -6739,7 +6563,7 @@ fail: #ifndef NO__1gtk_1im_1multicontext_1append_1menuitems JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC); /* @@ -6756,44 +6580,44 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems) #endif #ifndef NO__1gtk_1im_1multicontext_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1im_1multicontext_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1im_1multicontext_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1new_FUNC); - rc = (jintLong)gtk_im_multicontext_new(); + rc = (jlong)gtk_im_multicontext_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1image_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1image_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1image_1new_FUNC); - rc = (jintLong)gtk_image_new(); + rc = (jlong)gtk_image_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1image_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1image_1new_1from_1icon_1name___3B -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1icon_1name___3B) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1icon_1name___3B) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1icon_1name___3B_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)gtk_image_new_from_icon_name((const gchar *)lparg0); + rc = (jlong)gtk_image_new_from_icon_name((const gchar *)lparg0); */ { GTK_LOAD_FUNCTION(fp, gtk_image_new_from_icon_name) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0); } } fail: @@ -6804,20 +6628,20 @@ fail: #endif #ifndef NO__1gtk_1image_1new_1from_1icon_1name___3BI -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1icon_1name___3BI) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1icon_1name___3BI) (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1icon_1name___3BI_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)gtk_image_new_from_icon_name((const gchar *)lparg0, (GtkIconSize)arg1); + rc = (jlong)gtk_image_new_from_icon_name((const gchar *)lparg0, (GtkIconSize)arg1); */ { GTK_LOAD_FUNCTION(fp, gtk_image_new_from_icon_name) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkIconSize))fp)((const gchar *)lparg0, (GtkIconSize)arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(const gchar *, GtkIconSize))fp)((const gchar *)lparg0, (GtkIconSize)arg1); } } fail: @@ -6828,29 +6652,22 @@ fail: #endif #ifndef NO__1gtk_1image_1new_1from_1pixbuf -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1pixbuf) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC); - rc = (jintLong)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0); + rc = (jlong)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC); return rc; } #endif -#if (!defined(NO__1gtk_1image_1set_1from_1gicon__II) && !defined(JNI64)) || (!defined(NO__1gtk_1image_1set_1from_1gicon__JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO__1gtk_1image_1set_1from_1gicon__JJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon__II_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon__JJ_FUNC); -#endif /* gtk_image_set_from_gicon((GtkImage *)arg0, (GIcon *)arg1); */ @@ -6860,26 +6677,15 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__JJ)(JNIEnv *en ((void (CALLING_CONVENTION*)(GtkImage *, GIcon *))fp)((GtkImage *)arg0, (GIcon *)arg1); } } -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon__II_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon__JJ_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1image_1set_1from_1gicon__III) && !defined(JNI64)) || (!defined(NO__1gtk_1image_1set_1from_1gicon__JJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO__1gtk_1image_1set_1from_1gicon__JJI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__JJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon__III_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon__JJI_FUNC); -#endif /* gtk_image_set_from_gicon((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2); */ @@ -6889,27 +6695,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon__JJI)(JNIEnv *e ((void (CALLING_CONVENTION*)(GtkImage *, GIcon *, GtkIconSize))fp)((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2); } } -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon__III_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon__JJI_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1image_1set_1from_1icon_1name__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1image_1set_1from_1icon_1name__J_3B) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#endif +#ifndef NO__1gtk_1image_1set_1from_1icon_1name__J_3B +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__J_3B) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1icon_1name__I_3B_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1icon_1name__J_3B_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; /* gtk_image_set_from_icon_name((GtkImage *)arg0, (const gchar *)lparg1); @@ -6922,27 +6717,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__J_3B)(JNI } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1icon_1name__I_3B_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1icon_1name__J_3B_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1image_1set_1from_1icon_1name__I_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1image_1set_1from_1icon_1name__J_3BI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__J_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) -#endif +#ifndef NO__1gtk_1image_1set_1from_1icon_1name__J_3BI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__J_3BI) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1icon_1name__I_3BI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1icon_1name__J_3BI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; /* gtk_image_set_from_icon_name((GtkImage *)arg0, (const gchar *)lparg1, (GtkIconSize)arg2); @@ -6955,17 +6739,13 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name__J_3BI)(JN } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1icon_1name__I_3BI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1icon_1name__J_3BI_FUNC); -#endif } #endif #ifndef NO__1gtk_1image_1set_1from_1pixbuf JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC); gtk_image_set_from_pixbuf((GtkImage *)arg0, (GdkPixbuf *)arg1); @@ -6975,7 +6755,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1pixbuf) #ifndef NO__1gtk_1image_1set_1pixel_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1pixel_1size) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1pixel_1size_FUNC); gtk_image_set_pixel_size((GtkImage *)arg0, (gint)arg1); @@ -7042,12 +6822,12 @@ fail: #endif #ifndef NO__1gtk_1label_1get_1layout -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1label_1get_1layout) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1label_1get_1layout) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1label_1get_1layout_FUNC); - rc = (jintLong)gtk_label_get_layout((GtkLabel *)arg0); + rc = (jlong)gtk_label_get_layout((GtkLabel *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1label_1get_1layout_FUNC); return rc; } @@ -7055,7 +6835,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1label_1get_1layout) #ifndef NO__1gtk_1label_1get_1mnemonic_1keyval JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC); @@ -7066,14 +6846,14 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval) #endif #ifndef NO__1gtk_1label_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1label_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1label_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1label_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_label_new((const gchar *)lparg0); + rc = (jlong)gtk_label_new((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1label_1new_FUNC); @@ -7082,14 +6862,14 @@ fail: #endif #ifndef NO__1gtk_1label_1new_1with_1mnemonic -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1label_1new_1with_1mnemonic) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1label_1new_1with_1mnemonic) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_label_new_with_mnemonic((const gchar *)lparg0); + rc = (jlong)gtk_label_new_with_mnemonic((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC); @@ -7099,7 +6879,7 @@ fail: #ifndef NO__1gtk_1label_1set_1attributes JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1attributes) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1attributes_FUNC); gtk_label_set_attributes((GtkLabel *)arg0, (PangoAttrList *)arg1); @@ -7109,7 +6889,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1attributes) #ifndef NO__1gtk_1label_1set_1justify JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1justify) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1justify_FUNC); gtk_label_set_justify((GtkLabel *)arg0, (GtkJustification)arg1); @@ -7119,7 +6899,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1justify) #ifndef NO__1gtk_1label_1set_1line_1wrap JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1line_1wrap) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_FUNC); gtk_label_set_line_wrap((GtkLabel *)arg0, (gboolean)arg1); @@ -7129,7 +6909,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1line_1wrap) #ifndef NO__1gtk_1label_1set_1line_1wrap_1mode JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC); gtk_label_set_line_wrap_mode((GtkLabel *)arg0, (PangoWrapMode)arg1); @@ -7137,55 +6917,33 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode) } #endif -#if (!defined(NO__1gtk_1label_1set_1text__II) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO__1gtk_1label_1set_1text__JJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__II_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__JJ_FUNC); -#endif gtk_label_set_text((GtkLabel *)arg0, (const gchar *)arg1); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__II_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__JJ_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1label_1set_1text__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__J_3B) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#endif +#ifndef NO__1gtk_1label_1set_1text__J_3B +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__J_3B) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__I_3B_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__J_3B_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; gtk_label_set_text((GtkLabel *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__I_3B_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__J_3B_FUNC); -#endif } #endif #ifndef NO__1gtk_1label_1set_1text_1with_1mnemonic JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text_1with_1mnemonic) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC); @@ -7199,7 +6957,7 @@ fail: #ifndef NO__1gtk_1label_1set_1xalign JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1xalign) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1xalign_FUNC); /* @@ -7217,7 +6975,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1xalign) #ifndef NO__1gtk_1label_1set_1yalign JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1yalign) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1yalign_FUNC); /* @@ -7235,7 +6993,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1yalign) #ifndef NO__1gtk_1list_1store_1append JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1append) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1append_FUNC); gtk_list_store_append((GtkListStore *)arg0, (GtkTreeIter *)arg1); @@ -7245,7 +7003,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1append) #ifndef NO__1gtk_1list_1store_1clear JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1clear) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1clear_FUNC); gtk_list_store_clear((GtkListStore *)arg0); @@ -7255,7 +7013,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1clear) #ifndef NO__1gtk_1list_1store_1insert JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1insert) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1insert_FUNC); gtk_list_store_insert((GtkListStore *)arg0, (GtkTreeIter *)arg1, (gint)arg2); @@ -7264,14 +7022,14 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1insert) #endif #ifndef NO__1gtk_1list_1store_1newv -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1list_1store_1newv) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1list_1store_1newv) (JNIEnv *env, jclass that, jint arg0, jintLongArray arg1) { jintLong *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1newv_FUNC); if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_list_store_newv((gint)arg0, (GType *)lparg1); + rc = (jlong)gtk_list_store_newv((gint)arg0, (GType *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1newv_FUNC); @@ -7281,7 +7039,7 @@ fail: #ifndef NO__1gtk_1list_1store_1remove JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1remove) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1remove_FUNC); gtk_list_store_remove((GtkListStore *)arg0, (GtkTreeIter *)arg1); @@ -7289,115 +7047,60 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1remove) } #endif -#if (!defined(NO__1gtk_1list_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) -#endif +#ifndef NO__1gtk_1list_1store_1set__JJIII +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIII_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIII_FUNC); -#endif gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIII_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIII_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1list_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4) -#endif +#ifndef NO__1gtk_1list_1store_1set__JJIJI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIJI_FUNC); -#endif gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIJI_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4) -#endif +#ifndef NO__1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jint arg4) { GdkRGBA _arg3, *lparg3=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#endif if (arg3) if ((lparg3 = getGdkRGBAFields(env, arg3, &_arg3)) == NULL) goto fail; gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4); fail: -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1list_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIZI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4) -#endif +#ifndef NO__1gtk_1list_1store_1set__JJIZI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIZI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3, jint arg4) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIZI_FUNC); -#endif gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIZI_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1list_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJI_3BI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4) -#endif +#ifndef NO__1gtk_1list_1store_1set__JJI_3BI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJI_3BI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4) { jbyte *lparg3=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJI_3BI_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4); fail: if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJI_3BI_FUNC); -#endif } #endif @@ -7413,7 +7116,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1main) #ifndef NO__1gtk_1main_1do_1event JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1main_1do_1event) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1main_1do_1event_FUNC); gtk_main_do_event((GdkEvent *)arg0); @@ -7422,36 +7125,36 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1main_1do_1event) #endif #ifndef NO__1gtk_1menu_1bar_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1bar_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1menu_1bar_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1bar_1new_FUNC); - rc = (jintLong)gtk_menu_bar_new(); + rc = (jlong)gtk_menu_bar_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1menu_1item_1get_1submenu -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1get_1submenu) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1get_1submenu) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC); - rc = (jintLong)gtk_menu_item_get_submenu((GtkMenuItem *)arg0); + rc = (jlong)gtk_menu_item_get_submenu((GtkMenuItem *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC); return rc; } #endif #ifndef NO__1gtk_1menu_1item_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1new_FUNC); - rc = (jintLong)gtk_menu_item_new(); + rc = (jlong)gtk_menu_item_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1new_FUNC); return rc; } @@ -7459,7 +7162,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1new) #ifndef NO__1gtk_1menu_1item_1set_1submenu JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1item_1set_1submenu) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC); gtk_menu_item_set_submenu((GtkMenuItem *)arg0, (GtkWidget *)arg1); @@ -7468,12 +7171,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1item_1set_1submenu) #endif #ifndef NO__1gtk_1menu_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1menu_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1new_FUNC); - rc = (jintLong)gtk_menu_new(); + rc = (jlong)gtk_menu_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1new_FUNC); return rc; } @@ -7481,7 +7184,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1new) #ifndef NO__1gtk_1menu_1popdown JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popdown) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1popdown_FUNC); gtk_menu_popdown((GtkMenu *)arg0); @@ -7491,7 +7194,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popdown) #ifndef NO__1gtk_1menu_1popup JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jint arg6) { GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_FUNC); /* @@ -7509,7 +7212,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup) #ifndef NO__1gtk_1menu_1popup_1at_1pointer JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup_1at_1pointer) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_1at_1pointer_FUNC); /* @@ -7518,7 +7221,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup_1at_1pointer) { GTK_LOAD_FUNCTION(fp, gtk_menu_popup_at_pointer) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1popup_1at_1pointer_FUNC); @@ -7527,7 +7230,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup_1at_1pointer) #ifndef NO__1gtk_1menu_1popup_1at_1rect JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup_1at_1rect) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jintLong arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jlong arg5) { GdkRectangle _arg2, *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_1at_1rect_FUNC); @@ -7538,7 +7241,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup_1at_1rect) { GTK_LOAD_FUNCTION(fp, gtk_menu_popup_at_rect) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, GdkRectangle *, jint, jint, jintLong))fp)(arg0, arg1, lparg2, arg3, arg4, arg5); + ((void (CALLING_CONVENTION*)(jlong, jlong, GdkRectangle *, jint, jint, jlong))fp)(arg0, arg1, lparg2, arg3, arg4, arg5); } } fail: @@ -7549,7 +7252,7 @@ fail: #ifndef NO__1gtk_1menu_1shell_1deactivate JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1deactivate) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1deactivate_FUNC); gtk_menu_shell_deactivate((GtkMenuShell *)arg0); @@ -7559,7 +7262,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1deactivate) #ifndef NO__1gtk_1menu_1shell_1insert JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1insert) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1insert_FUNC); gtk_menu_shell_insert((GtkMenuShell *)arg0, (GtkWidget *)arg1, (gint)arg2); @@ -7569,7 +7272,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1insert) #ifndef NO__1gtk_1menu_1shell_1set_1take_1focus JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC); gtk_menu_shell_set_take_focus((GtkMenuShell *)arg0, (gboolean)arg1); @@ -7578,14 +7281,14 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus) #endif #ifndef NO__1gtk_1menu_1tool_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1tool_1button_1new) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1menu_1tool_1button_1new) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1tool_1button_1new_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_menu_tool_button_new((GtkWidget *)arg0, (const gchar *)lparg1); + rc = (jlong)gtk_menu_tool_button_new((GtkWidget *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1tool_1button_1new_FUNC); @@ -7594,16 +7297,16 @@ fail: #endif #ifndef NO__1gtk_1message_1dialog_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1message_1dialog_1new) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1message_1dialog_1new) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5) { jbyte *lparg4=NULL; jbyte *lparg5=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC); if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4, (const gchar *)lparg5); + rc = (jlong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4, (const gchar *)lparg5); fail: if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0); if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0); @@ -7614,7 +7317,7 @@ fail: #ifndef NO__1gtk_1misc_1set_1alignment JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1misc_1set_1alignment) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1misc_1set_1alignment_FUNC); /* @@ -7632,7 +7335,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1misc_1set_1alignment) #ifndef NO__1gtk_1native_1dialog_1run JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1native_1dialog_1run) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1native_1dialog_1run_FUNC); @@ -7644,7 +7347,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1native_1dialog_1run) #ifndef NO__1gtk_1notebook_1get_1current_1page JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1notebook_1get_1current_1page) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1current_1page_FUNC); @@ -7656,7 +7359,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1notebook_1get_1current_1page) #ifndef NO__1gtk_1notebook_1get_1scrollable JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1notebook_1get_1scrollable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1scrollable_FUNC); @@ -7668,7 +7371,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1notebook_1get_1scrollable) #ifndef NO__1gtk_1notebook_1insert_1page JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1insert_1page) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1insert_1page_FUNC); gtk_notebook_insert_page((GtkNotebook *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (gint)arg3); @@ -7677,12 +7380,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1insert_1page) #endif #ifndef NO__1gtk_1notebook_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1notebook_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1notebook_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1new_FUNC); - rc = (jintLong)gtk_notebook_new(); + rc = (jlong)gtk_notebook_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1new_FUNC); return rc; } @@ -7690,7 +7393,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1notebook_1new) #ifndef NO__1gtk_1notebook_1next_1page JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1next_1page) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1next_1page_FUNC); gtk_notebook_next_page((GtkNotebook *)arg0); @@ -7700,7 +7403,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1next_1page) #ifndef NO__1gtk_1notebook_1prev_1page JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1prev_1page) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1prev_1page_FUNC); gtk_notebook_prev_page((GtkNotebook *)arg0); @@ -7710,7 +7413,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1prev_1page) #ifndef NO__1gtk_1notebook_1remove_1page JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1remove_1page) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1remove_1page_FUNC); gtk_notebook_remove_page((GtkNotebook *)arg0, (gint)arg1); @@ -7720,7 +7423,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1remove_1page) #ifndef NO__1gtk_1notebook_1set_1current_1page JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1current_1page) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1current_1page_FUNC); gtk_notebook_set_current_page((GtkNotebook *)arg0, (gint)arg1); @@ -7730,7 +7433,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1current_1page) #ifndef NO__1gtk_1notebook_1set_1scrollable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1scrollable) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1scrollable_FUNC); gtk_notebook_set_scrollable((GtkNotebook *)arg0, (gboolean)arg1); @@ -7740,7 +7443,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1scrollable) #ifndef NO__1gtk_1notebook_1set_1show_1tabs JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1show_1tabs) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC); gtk_notebook_set_show_tabs((GtkNotebook *)arg0, (gboolean)arg1); @@ -7750,7 +7453,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1show_1tabs) #ifndef NO__1gtk_1notebook_1set_1tab_1pos JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1tab_1pos) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC); gtk_notebook_set_tab_pos((GtkNotebook *)arg0, (GtkPositionType)arg1); @@ -7760,7 +7463,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1tab_1pos) #ifndef NO__1gtk_1orientable_1set_1orientation JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1orientable_1set_1orientation) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1orientable_1set_1orientation_FUNC); gtk_orientable_set_orientation((GtkOrientable *)arg0, (GtkOrientation)arg1); @@ -7770,7 +7473,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1orientable_1set_1orientation) #ifndef NO__1gtk_1page_1setup_1get_1bottom_1margin JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC); @@ -7782,7 +7485,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin) #ifndef NO__1gtk_1page_1setup_1get_1left_1margin JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1left_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC); @@ -7794,7 +7497,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1left_1margin) #ifndef NO__1gtk_1page_1setup_1get_1orientation JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1orientation) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC); @@ -7806,7 +7509,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1orientation) #ifndef NO__1gtk_1page_1setup_1get_1page_1height JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1page_1height) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC); @@ -7818,7 +7521,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1page_1height) #ifndef NO__1gtk_1page_1setup_1get_1page_1width JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1page_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC); @@ -7830,7 +7533,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1page_1width) #ifndef NO__1gtk_1page_1setup_1get_1paper_1height JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1height) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC); @@ -7841,12 +7544,12 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1height) #endif #ifndef NO__1gtk_1page_1setup_1get_1paper_1size -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1size) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1size) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC); - rc = (jintLong)gtk_page_setup_get_paper_size((GtkPageSetup *)arg0); + rc = (jlong)gtk_page_setup_get_paper_size((GtkPageSetup *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC); return rc; } @@ -7854,7 +7557,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1size) #ifndef NO__1gtk_1page_1setup_1get_1paper_1width JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC); @@ -7866,7 +7569,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1width) #ifndef NO__1gtk_1page_1setup_1get_1right_1margin JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1right_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC); @@ -7878,7 +7581,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1right_1margin) #ifndef NO__1gtk_1page_1setup_1get_1top_1margin JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1top_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC); @@ -7889,12 +7592,12 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1top_1margin) #endif #ifndef NO__1gtk_1page_1setup_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1new_FUNC); - rc = (jintLong)gtk_page_setup_new(); + rc = (jlong)gtk_page_setup_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1new_FUNC); return rc; } @@ -7902,7 +7605,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1new) #ifndef NO__1gtk_1page_1setup_1set_1bottom_1margin JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC); gtk_page_setup_set_bottom_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2); @@ -7912,7 +7615,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin) #ifndef NO__1gtk_1page_1setup_1set_1left_1margin JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1left_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC); gtk_page_setup_set_left_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2); @@ -7922,7 +7625,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1left_1margin) #ifndef NO__1gtk_1page_1setup_1set_1orientation JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1orientation) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC); gtk_page_setup_set_orientation((GtkPageSetup *)arg0, (GtkPageOrientation)arg1); @@ -7932,7 +7635,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1orientation) #ifndef NO__1gtk_1page_1setup_1set_1paper_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1paper_1size) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC); gtk_page_setup_set_paper_size((GtkPageSetup *)arg0, (GtkPaperSize *)arg1); @@ -7942,7 +7645,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1paper_1size) #ifndef NO__1gtk_1page_1setup_1set_1right_1margin JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1right_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC); gtk_page_setup_set_right_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2); @@ -7952,7 +7655,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1right_1margin) #ifndef NO__1gtk_1page_1setup_1set_1top_1margin JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1top_1margin) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC); gtk_page_setup_set_top_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2); @@ -7962,7 +7665,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1top_1margin) #ifndef NO__1gtk_1paper_1size_1free JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1paper_1size_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC); gtk_paper_size_free((GtkPaperSize *)arg0); @@ -7971,12 +7674,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1paper_1size_1free) #endif #ifndef NO__1gtk_1paper_1size_1get_1display_1name -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1display_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1display_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC); - rc = (jintLong)gtk_paper_size_get_display_name((GtkPaperSize *)arg0); + rc = (jlong)gtk_paper_size_get_display_name((GtkPaperSize *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC); return rc; } @@ -7984,7 +7687,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1display_1name) #ifndef NO__1gtk_1paper_1size_1get_1height JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1height) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1height_FUNC); @@ -7995,24 +7698,24 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1height) #endif #ifndef NO__1gtk_1paper_1size_1get_1name -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1name_FUNC); - rc = (jintLong)gtk_paper_size_get_name((GtkPaperSize *)arg0); + rc = (jlong)gtk_paper_size_get_name((GtkPaperSize *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1name_FUNC); return rc; } #endif #ifndef NO__1gtk_1paper_1size_1get_1ppd_1name -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC); - rc = (jintLong)gtk_paper_size_get_ppd_name((GtkPaperSize *)arg0); + rc = (jlong)gtk_paper_size_get_ppd_name((GtkPaperSize *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC); return rc; } @@ -8020,7 +7723,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name) #ifndef NO__1gtk_1paper_1size_1get_1width JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1width_FUNC); @@ -8032,7 +7735,7 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1width) #ifndef NO__1gtk_1paper_1size_1is_1custom JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1paper_1size_1is_1custom) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1is_1custom_FUNC); @@ -8043,14 +7746,14 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1paper_1size_1is_1custom) #endif #ifndef NO__1gtk_1paper_1size_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_paper_size_new((const gchar *)lparg0); + rc = (jlong)gtk_paper_size_new((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1new_FUNC); @@ -8059,16 +7762,16 @@ fail: #endif #ifndef NO__1gtk_1paper_1size_1new_1custom -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new_1custom) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new_1custom) (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3, jint arg4) { jbyte *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1custom_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_paper_size_new_custom((const gchar *)lparg0, (const gchar *)lparg1, (gdouble)arg2, (gdouble)arg3, (GtkUnit)arg4); + rc = (jlong)gtk_paper_size_new_custom((const gchar *)lparg0, (const gchar *)lparg1, (gdouble)arg2, (gdouble)arg3, (GtkUnit)arg4); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); @@ -8078,16 +7781,16 @@ fail: #endif #ifndef NO__1gtk_1paper_1size_1new_1from_1ppd -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd) (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3) { jbyte *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_paper_size_new_from_ppd((const gchar *)lparg0, (const gchar *)lparg1, (gdouble)arg2, (gdouble)arg3); + rc = (jlong)gtk_paper_size_new_from_ppd((const gchar *)lparg0, (const gchar *)lparg1, (gdouble)arg2, (gdouble)arg3); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); @@ -8097,42 +7800,42 @@ fail: #endif #ifndef NO__1gtk_1plug_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1plug_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1plug_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1plug_1new_FUNC); - rc = (jintLong)gtk_plug_new(arg0); + rc = (jlong)gtk_plug_new(arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1plug_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1print_1job_1get_1surface -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1job_1get_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1job_1get_1surface) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { - jintLong *lparg1=NULL; - jintLong rc = 0; + jlong *lparg1=NULL; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1surface_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_print_job_get_surface((GtkPrintJob *)arg0, (GError **)lparg1); + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + rc = (jlong)gtk_print_job_get_surface((GtkPrintJob *)arg0, (GError **)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1surface_FUNC); return rc; } #endif #ifndef NO__1gtk_1print_1job_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1job_1new) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2, jintLong arg3) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1job_1new) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jlong arg2, jlong arg3) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1job_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_print_job_new((const gchar *)lparg0, (GtkPrinter *)arg1, (GtkPrintSettings *)arg2, (GtkPageSetup *)arg3); + rc = (jlong)gtk_print_job_new((const gchar *)lparg0, (GtkPrinter *)arg1, (GtkPrintSettings *)arg2, (GtkPageSetup *)arg3); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1job_1new_FUNC); @@ -8142,7 +7845,7 @@ fail: #ifndef NO__1gtk_1print_1job_1send JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1job_1send) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1job_1send_FUNC); gtk_print_job_send((GtkPrintJob *)arg0, (GtkPrintJobCompleteFunc)arg1, (gpointer)arg2, (GDestroyNotify)arg3); @@ -8152,7 +7855,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1job_1send) #ifndef NO__1gtk_1print_1settings_1foreach JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1foreach) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1foreach_FUNC); gtk_print_settings_foreach((GtkPrintSettings *)arg0, (GtkPrintSettingsFunc)arg1, (gpointer)arg2); @@ -8161,14 +7864,14 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1foreach) #endif #ifndef NO__1gtk_1print_1settings_1get -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_print_settings_get((GtkPrintSettings *)arg0, (const gchar *)lparg1); + rc = (jlong)gtk_print_settings_get((GtkPrintSettings *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_FUNC); @@ -8178,7 +7881,7 @@ fail: #ifndef NO__1gtk_1print_1settings_1get_1collate JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1collate) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1collate_FUNC); @@ -8190,7 +7893,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1collate) #ifndef NO__1gtk_1print_1settings_1get_1duplex JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1duplex) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1duplex_FUNC); @@ -8202,7 +7905,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1duplex) #ifndef NO__1gtk_1print_1settings_1get_1n_1copies JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1n_1copies) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC); @@ -8213,14 +7916,14 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1n_1copies) #endif #ifndef NO__1gtk_1print_1settings_1get_1page_1ranges -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC); if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_print_settings_get_page_ranges((GtkPrintSettings *)arg0, (gint *)lparg1); + rc = (jlong)gtk_print_settings_get_page_ranges((GtkPrintSettings *)arg0, (gint *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC); @@ -8230,7 +7933,7 @@ fail: #ifndef NO__1gtk_1print_1settings_1get_1print_1pages JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1print_1pages) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC); @@ -8242,7 +7945,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1print_1pages) #ifndef NO__1gtk_1print_1settings_1get_1resolution JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1resolution) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC); @@ -8253,12 +7956,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1resolution) #endif #ifndef NO__1gtk_1print_1settings_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1new_FUNC); - rc = (jintLong)gtk_print_settings_new(); + rc = (jlong)gtk_print_settings_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1new_FUNC); return rc; } @@ -8266,7 +7969,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1new) #ifndef NO__1gtk_1print_1settings_1set JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -8283,7 +7986,7 @@ fail: #ifndef NO__1gtk_1print_1settings_1set_1collate JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1collate) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1collate_FUNC); gtk_print_settings_set_collate((GtkPrintSettings *)arg0, (gboolean)arg1); @@ -8293,7 +7996,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1collate) #ifndef NO__1gtk_1print_1settings_1set_1duplex JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1duplex) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1duplex_FUNC); gtk_print_settings_set_duplex((GtkPrintSettings *)arg0, (GtkPrintDuplex)arg1); @@ -8303,7 +8006,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1duplex) #ifndef NO__1gtk_1print_1settings_1set_1n_1copies JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1n_1copies) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC); gtk_print_settings_set_n_copies((GtkPrintSettings *)arg0, (gint)arg1); @@ -8313,7 +8016,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1n_1copies) #ifndef NO__1gtk_1print_1settings_1set_1orientation JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1orientation) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC); gtk_print_settings_set_orientation((GtkPrintSettings *)arg0, (GtkPageOrientation)arg1); @@ -8323,7 +8026,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1orientation) #ifndef NO__1gtk_1print_1settings_1set_1page_1ranges JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jint arg2) { jint *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC); @@ -8337,7 +8040,7 @@ fail: #ifndef NO__1gtk_1print_1settings_1set_1print_1pages JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1print_1pages) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC); gtk_print_settings_set_print_pages((GtkPrintSettings *)arg0, (GtkPrintPages)arg1); @@ -8347,7 +8050,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1print_1pages) #ifndef NO__1gtk_1print_1settings_1set_1printer JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1printer) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1printer_FUNC); @@ -8361,7 +8064,7 @@ fail: #ifndef NO__1gtk_1print_1unix_1dialog_1get_1current_1page JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC); @@ -8372,50 +8075,50 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page #endif #ifndef NO__1gtk_1print_1unix_1dialog_1get_1page_1setup -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC); - rc = (jintLong)gtk_print_unix_dialog_get_page_setup((GtkPrintUnixDialog *)arg0); + rc = (jlong)gtk_print_unix_dialog_get_page_setup((GtkPrintUnixDialog *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC); return rc; } #endif #ifndef NO__1gtk_1print_1unix_1dialog_1get_1selected_1printer -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC); - rc = (jintLong)gtk_print_unix_dialog_get_selected_printer((GtkPrintUnixDialog *)arg0); + rc = (jlong)gtk_print_unix_dialog_get_selected_printer((GtkPrintUnixDialog *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC); return rc; } #endif #ifndef NO__1gtk_1print_1unix_1dialog_1get_1settings -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC); - rc = (jintLong)gtk_print_unix_dialog_get_settings((GtkPrintUnixDialog *)arg0); + rc = (jlong)gtk_print_unix_dialog_get_settings((GtkPrintUnixDialog *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC); return rc; } #endif #ifndef NO__1gtk_1print_1unix_1dialog_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1new) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1new) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); + rc = (jlong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC); @@ -8425,7 +8128,7 @@ fail: #ifndef NO__1gtk_1print_1unix_1dialog_1set_1current_1page JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC); gtk_print_unix_dialog_set_current_page((GtkPrintUnixDialog *)arg0, (gint)arg1); @@ -8435,7 +8138,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page #ifndef NO__1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup_FUNC); gtk_print_unix_dialog_set_embed_page_setup((GtkPrintUnixDialog *)arg0, (gboolean)arg1); @@ -8445,7 +8148,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1embed_1page_1 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1manual_1capabilities JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabilities) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC); gtk_print_unix_dialog_set_manual_capabilities((GtkPrintUnixDialog *)arg0, (GtkPrintCapabilities)arg1); @@ -8455,7 +8158,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capab #ifndef NO__1gtk_1print_1unix_1dialog_1set_1page_1setup JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC); gtk_print_unix_dialog_set_page_setup((GtkPrintUnixDialog *)arg0, (GtkPageSetup *)arg1); @@ -8465,7 +8168,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup) #ifndef NO__1gtk_1print_1unix_1dialog_1set_1settings JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC); gtk_print_unix_dialog_set_settings((GtkPrintUnixDialog *)arg0, (GtkPrintSettings *)arg1); @@ -8474,24 +8177,24 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings) #endif #ifndef NO__1gtk_1printer_1get_1backend -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1get_1backend) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1printer_1get_1backend) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1backend_FUNC); - rc = (jintLong)gtk_printer_get_backend((GtkPrinter *)arg0); + rc = (jlong)gtk_printer_get_backend((GtkPrinter *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1backend_FUNC); return rc; } #endif #ifndef NO__1gtk_1printer_1get_1name -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1get_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1printer_1get_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1name_FUNC); - rc = (jintLong)gtk_printer_get_name((GtkPrinter *)arg0); + rc = (jlong)gtk_printer_get_name((GtkPrinter *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1name_FUNC); return rc; } @@ -8499,7 +8202,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1get_1name) #ifndef NO__1gtk_1printer_1is_1default JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1printer_1is_1default) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1is_1default_FUNC); @@ -8510,18 +8213,18 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1printer_1is_1default) #endif #ifndef NO__1gtk_1printer_1option_1widget_1get_1type -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1option_1widget_1get_1type) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1printer_1option_1widget_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1option_1widget_1get_1type_FUNC); /* - rc = (jintLong)gtk_printer_option_widget_get_type(); + rc = (jlong)gtk_printer_option_widget_get_type(); */ { GTK_LOAD_FUNCTION(fp, gtk_printer_option_widget_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } GTK_NATIVE_EXIT(env, that, _1gtk_1printer_1option_1widget_1get_1type_FUNC); @@ -8530,12 +8233,12 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1option_1widget_1get_1type) #endif #ifndef NO__1gtk_1progress_1bar_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1new_FUNC); - rc = (jintLong)gtk_progress_bar_new(); + rc = (jlong)gtk_progress_bar_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1new_FUNC); return rc; } @@ -8543,7 +8246,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1new) #ifndef NO__1gtk_1progress_1bar_1pulse JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1pulse) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1pulse_FUNC); gtk_progress_bar_pulse((GtkProgressBar *)arg0); @@ -8553,7 +8256,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1pulse) #ifndef NO__1gtk_1progress_1bar_1set_1fraction JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1set_1fraction) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC); gtk_progress_bar_set_fraction((GtkProgressBar *)arg0, (gdouble)arg1); @@ -8563,7 +8266,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1set_1fraction) #ifndef NO__1gtk_1progress_1bar_1set_1inverted JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1set_1inverted) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1inverted_FUNC); gtk_progress_bar_set_inverted((GtkProgressBar *)arg0, (gboolean)arg1); @@ -8572,60 +8275,60 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1set_1inverted) #endif #ifndef NO__1gtk_1radio_1button_1get_1group -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1button_1get_1group) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1radio_1button_1get_1group) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1get_1group_FUNC); - rc = (jintLong)gtk_radio_button_get_group((GtkRadioButton *)arg0); + rc = (jlong)gtk_radio_button_get_group((GtkRadioButton *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1get_1group_FUNC); return rc; } #endif #ifndef NO__1gtk_1radio_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1button_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1radio_1button_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1new_FUNC); - rc = (jintLong)gtk_radio_button_new((GSList *)arg0); + rc = (jlong)gtk_radio_button_new((GSList *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1radio_1menu_1item_1get_1group -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1menu_1item_1get_1group) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1radio_1menu_1item_1get_1group) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC); - rc = (jintLong)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0); + rc = (jlong)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC); return rc; } #endif #ifndef NO__1gtk_1radio_1menu_1item_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1menu_1item_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1radio_1menu_1item_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_FUNC); - rc = (jintLong)gtk_radio_menu_item_new((GSList *)arg0); + rc = (jlong)gtk_radio_menu_item_new((GSList *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1range_1get_1adjustment -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1range_1get_1adjustment) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1range_1get_1adjustment) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1range_1get_1adjustment_FUNC); - rc = (jintLong)gtk_range_get_adjustment((GtkRange *)arg0); + rc = (jlong)gtk_range_get_adjustment((GtkRange *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1range_1get_1adjustment_FUNC); return rc; } @@ -8633,7 +8336,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1range_1get_1adjustment) #ifndef NO__1gtk_1range_1get_1slider_1range JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1get_1slider_1range) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -8650,7 +8353,7 @@ fail: #ifndef NO__1gtk_1range_1set_1increments JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1increments) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1increments_FUNC); gtk_range_set_increments((GtkRange *)arg0, arg1, arg2); @@ -8660,7 +8363,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1increments) #ifndef NO__1gtk_1range_1set_1inverted JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1inverted) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1inverted_FUNC); gtk_range_set_inverted((GtkRange *)arg0, arg1); @@ -8670,7 +8373,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1inverted) #ifndef NO__1gtk_1range_1set_1range JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1range) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1range_FUNC); gtk_range_set_range((GtkRange *)arg0, arg1, arg2); @@ -8680,7 +8383,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1range) #ifndef NO__1gtk_1range_1set_1value JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1value) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1value_FUNC); gtk_range_set_value((GtkRange *)arg0, arg1); @@ -8690,7 +8393,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1value) #ifndef NO__1gtk_1render_1background JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1background) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { GTK_NATIVE_ENTER(env, that, _1gtk_1render_1background_FUNC); gtk_render_background((GtkStyleContext *)arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); @@ -8700,7 +8403,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1background) #ifndef NO__1gtk_1render_1focus JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1focus) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { GTK_NATIVE_ENTER(env, that, _1gtk_1render_1focus_FUNC); gtk_render_focus((GtkStyleContext *)arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); @@ -8710,7 +8413,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1focus) #ifndef NO__1gtk_1render_1frame JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1frame) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { GTK_NATIVE_ENTER(env, that, _1gtk_1render_1frame_FUNC); gtk_render_frame((GtkStyleContext *)arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); @@ -8720,7 +8423,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1frame) #ifndef NO__1gtk_1render_1handle JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1handle) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) { GTK_NATIVE_ENTER(env, that, _1gtk_1render_1handle_FUNC); gtk_render_handle((GtkStyleContext *)arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); @@ -8749,12 +8452,12 @@ fail: #endif #ifndef NO__1gtk_1scale_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scale_1new) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scale_1new) + (JNIEnv *env, jclass that, jint arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scale_1new_FUNC); - rc = (jintLong)gtk_scale_new((GtkOrientation)arg0, (GtkAdjustment *)arg1); + rc = (jlong)gtk_scale_new((GtkOrientation)arg0, (GtkAdjustment *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1scale_1new_FUNC); return rc; } @@ -8762,7 +8465,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scale_1new) #ifndef NO__1gtk_1scale_1set_1digits JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scale_1set_1digits) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1digits_FUNC); gtk_scale_set_digits((GtkScale *)arg0, (gint)arg1); @@ -8772,7 +8475,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scale_1set_1digits) #ifndef NO__1gtk_1scale_1set_1draw_1value JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scale_1set_1draw_1value) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1draw_1value_FUNC); gtk_scale_set_draw_value((GtkScale *)arg0, (gboolean)arg1); @@ -8781,48 +8484,48 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scale_1set_1draw_1value) #endif #ifndef NO__1gtk_1scrollable_1get_1vadjustment -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrollable_1get_1vadjustment) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scrollable_1get_1vadjustment) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrollable_1get_1vadjustment_FUNC); - rc = (jintLong)gtk_scrollable_get_vadjustment((GtkScrollable *)arg0); + rc = (jlong)gtk_scrollable_get_vadjustment((GtkScrollable *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1scrollable_1get_1vadjustment_FUNC); return rc; } #endif #ifndef NO__1gtk_1scrollbar_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrollbar_1new) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scrollbar_1new) + (JNIEnv *env, jclass that, jint arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrollbar_1new_FUNC); - rc = (jintLong)gtk_scrollbar_new((GtkOrientation)arg0, (GtkAdjustment *)arg1); + rc = (jlong)gtk_scrollbar_new((GtkOrientation)arg0, (GtkAdjustment *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1scrollbar_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1scrolled_1window_1get_1hadjustment -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC); - rc = (jintLong)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0); + rc = (jlong)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC); return rc; } #endif #ifndef NO__1gtk_1scrolled_1window_1get_1hscrollbar -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1hscrollbar) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1hscrollbar) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hscrollbar_FUNC); - rc = (jintLong)gtk_scrolled_window_get_hscrollbar((GtkScrolledWindow *)arg0); + rc = (jlong)gtk_scrolled_window_get_hscrollbar((GtkScrolledWindow *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hscrollbar_FUNC); return rc; } @@ -8830,7 +8533,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1hscrollbar) #ifndef NO__1gtk_1scrolled_1window_1get_1overlay_1scrolling JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1overlay_1scrolling) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1overlay_1scrolling_FUNC); @@ -8850,7 +8553,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1overlay_1scr #ifndef NO__1gtk_1scrolled_1window_1get_1policy JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1policy) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -8867,7 +8570,7 @@ fail: #ifndef NO__1gtk_1scrolled_1window_1get_1shadow_1type JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC); @@ -8878,36 +8581,36 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type) #endif #ifndef NO__1gtk_1scrolled_1window_1get_1vadjustment -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC); - rc = (jintLong)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0); + rc = (jlong)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC); return rc; } #endif #ifndef NO__1gtk_1scrolled_1window_1get_1vscrollbar -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1vscrollbar) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1vscrollbar) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vscrollbar_FUNC); - rc = (jintLong)gtk_scrolled_window_get_vscrollbar((GtkScrolledWindow *)arg0); + rc = (jlong)gtk_scrolled_window_get_vscrollbar((GtkScrolledWindow *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vscrollbar_FUNC); return rc; } #endif #ifndef NO__1gtk_1scrolled_1window_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1new) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1new) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1new_FUNC); - rc = (jintLong)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1); + rc = (jlong)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1new_FUNC); return rc; } @@ -8915,7 +8618,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1new) #ifndef NO__1gtk_1scrolled_1window_1set_1policy JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1set_1policy) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC); gtk_scrolled_window_set_policy((GtkScrolledWindow *)arg0, (GtkPolicyType)arg1, (GtkPolicyType)arg2); @@ -8925,7 +8628,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1set_1policy) #ifndef NO__1gtk_1scrolled_1window_1set_1shadow_1type JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)arg0, (GtkShadowType)arg1); @@ -8934,12 +8637,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type) #endif #ifndef NO__1gtk_1search_1entry_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1search_1entry_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1search_1entry_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1search_1entry_1new_FUNC); - rc = (jintLong)gtk_search_entry_new(); + rc = (jlong)gtk_search_entry_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1search_1entry_1new_FUNC); return rc; } @@ -8947,7 +8650,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1search_1entry_1new) #ifndef NO__1gtk_1selection_1data_1free JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1selection_1data_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1free_FUNC); gtk_selection_data_free((GtkSelectionData *)arg0); @@ -8956,24 +8659,24 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1selection_1data_1free) #endif #ifndef NO__1gtk_1selection_1data_1get_1data -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1data) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1data) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1data_FUNC); - rc = (jintLong)gtk_selection_data_get_data((GtkSelectionData *)arg0); + rc = (jlong)gtk_selection_data_get_data((GtkSelectionData *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1data_FUNC); return rc; } #endif #ifndef NO__1gtk_1selection_1data_1get_1data_1type -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1data_1type) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1data_1type) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1data_1type_FUNC); - rc = (jintLong)gtk_selection_data_get_data_type((GtkSelectionData *)arg0); + rc = (jlong)gtk_selection_data_get_data_type((GtkSelectionData *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1data_1type_FUNC); return rc; } @@ -8981,7 +8684,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1data_1type) #ifndef NO__1gtk_1selection_1data_1get_1format JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1format) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1format_FUNC); @@ -8993,7 +8696,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1format) #ifndef NO__1gtk_1selection_1data_1get_1length JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1length_FUNC); @@ -9004,12 +8707,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1length) #endif #ifndef NO__1gtk_1selection_1data_1get_1target -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1target) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1target) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1target_FUNC); - rc = (jintLong)gtk_selection_data_get_target((GtkSelectionData *)arg0); + rc = (jlong)gtk_selection_data_get_target((GtkSelectionData *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1target_FUNC); return rc; } @@ -9017,7 +8720,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1target) #ifndef NO__1gtk_1selection_1data_1set JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1selection_1data_1set) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4) { GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1set_FUNC); gtk_selection_data_set((GtkSelectionData *)arg0, (GdkAtom)arg1, (gint)arg2, (const guchar *)arg3, (gint)arg4); @@ -9026,36 +8729,36 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1selection_1data_1set) #endif #ifndef NO__1gtk_1separator_1menu_1item_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1separator_1menu_1item_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1separator_1menu_1item_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1menu_1item_1new_FUNC); - rc = (jintLong)gtk_separator_menu_item_new(); + rc = (jlong)gtk_separator_menu_item_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1separator_1menu_1item_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1separator_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1separator_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1separator_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1new_FUNC); - rc = (jintLong)gtk_separator_new((GtkOrientation)arg0); + rc = (jlong)gtk_separator_new((GtkOrientation)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1separator_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1separator_1tool_1item_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1separator_1tool_1item_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1separator_1tool_1item_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1tool_1item_1new_FUNC); - rc = (jintLong)gtk_separator_tool_item_new(); + rc = (jlong)gtk_separator_tool_item_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1separator_1tool_1item_1new_FUNC); return rc; } @@ -9063,7 +8766,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1separator_1tool_1item_1new) #ifndef NO__1gtk_1separator_1tool_1item_1set_1draw JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1separator_1tool_1item_1set_1draw) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1tool_1item_1set_1draw_FUNC); gtk_separator_tool_item_set_draw((GtkSeparatorToolItem *)arg0, (gboolean)arg1); @@ -9072,48 +8775,48 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1separator_1tool_1item_1set_1draw) #endif #ifndef NO__1gtk_1settings_1get_1default -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1settings_1get_1default) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1settings_1get_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1settings_1get_1default_FUNC); - rc = (jintLong)gtk_settings_get_default(); + rc = (jlong)gtk_settings_get_default(); GTK_NATIVE_EXIT(env, that, _1gtk_1settings_1get_1default_FUNC); return rc; } #endif #ifndef NO__1gtk_1snapshot_1append_1cairo -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1snapshot_1append_1cairo) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1snapshot_1append_1cairo) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1snapshot_1append_1cairo_FUNC); - rc = (jintLong)gtk_snapshot_append_cairo((GtkSnapshot *)arg0, (const graphene_rect_t *)arg1); + rc = (jlong)gtk_snapshot_append_cairo((GtkSnapshot *)arg0, (const graphene_rect_t *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1snapshot_1append_1cairo_FUNC); return rc; } #endif #ifndef NO__1gtk_1socket_1get_1id -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1socket_1get_1id) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1socket_1get_1id) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1socket_1get_1id_FUNC); - rc = (jintLong)gtk_socket_get_id((GtkSocket *)arg0); + rc = (jlong)gtk_socket_get_id((GtkSocket *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1socket_1get_1id_FUNC); return rc; } #endif #ifndef NO__1gtk_1socket_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1socket_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1socket_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1socket_1new_FUNC); - rc = (jintLong)gtk_socket_new(); + rc = (jlong)gtk_socket_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1socket_1new_FUNC); return rc; } @@ -9121,7 +8824,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1socket_1new) #ifndef NO__1gtk_1spin_1button_1configure JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1configure) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jint arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1configure_FUNC); gtk_spin_button_configure((GtkSpinButton*)arg0, (GtkAdjustment *)arg1, arg2, arg3); @@ -9130,12 +8833,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1configure) #endif #ifndef NO__1gtk_1spin_1button_1get_1adjustment -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1get_1adjustment) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1get_1adjustment) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC); - rc = (jintLong)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0); + rc = (jlong)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC); return rc; } @@ -9143,7 +8846,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1get_1adjustment) #ifndef NO__1gtk_1spin_1button_1get_1digits JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1spin_1button_1get_1digits) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1digits_FUNC); @@ -9154,12 +8857,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1spin_1button_1get_1digits) #endif #ifndef NO__1gtk_1spin_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1new) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1new) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1new_FUNC); - rc = (jintLong)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2); + rc = (jlong)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2); GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1new_FUNC); return rc; } @@ -9167,7 +8870,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1new) #ifndef NO__1gtk_1spin_1button_1set_1digits JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1digits) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1digits_FUNC); gtk_spin_button_set_digits((GtkSpinButton*)arg0, arg1); @@ -9177,7 +8880,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1digits) #ifndef NO__1gtk_1spin_1button_1set_1increments JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1increments) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1increments_FUNC); gtk_spin_button_set_increments((GtkSpinButton*)arg0, arg1, arg2); @@ -9187,7 +8890,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1increments) #ifndef NO__1gtk_1spin_1button_1set_1numeric JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1numeric) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1numeric_FUNC); gtk_spin_button_set_numeric((GtkSpinButton*)arg0, (gboolean)arg1); @@ -9197,7 +8900,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1numeric) #ifndef NO__1gtk_1spin_1button_1set_1range JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1range) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1range_FUNC); gtk_spin_button_set_range((GtkSpinButton*)arg0, arg1, arg2); @@ -9207,7 +8910,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1range) #ifndef NO__1gtk_1spin_1button_1set_1value JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1value) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1value_FUNC); gtk_spin_button_set_value((GtkSpinButton*)arg0, arg1); @@ -9217,7 +8920,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1value) #ifndef NO__1gtk_1spin_1button_1set_1wrap JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1wrap) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC); gtk_spin_button_set_wrap((GtkSpinButton*)arg0, arg1); @@ -9227,7 +8930,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1wrap) #ifndef NO__1gtk_1spin_1button_1update JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1update) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1update_FUNC); gtk_spin_button_update((GtkSpinButton*)arg0); @@ -9237,7 +8940,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1update) #ifndef NO__1gtk_1status_1icon_1get_1geometry JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1status_1icon_1get_1geometry) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3) { GdkRectangle _arg2, *lparg2=NULL; jboolean rc = 0; @@ -9253,7 +8956,7 @@ fail: #ifndef NO__1gtk_1status_1icon_1get_1visible JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1status_1icon_1get_1visible) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1get_1visible_FUNC); @@ -9264,24 +8967,24 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1status_1icon_1get_1visible) #endif #ifndef NO__1gtk_1status_1icon_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1status_1icon_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1status_1icon_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1new_FUNC); - rc = (jintLong)gtk_status_icon_new(); + rc = (jlong)gtk_status_icon_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1new_FUNC); return rc; } #endif #ifndef NO__1gtk_1status_1icon_1position_1menu_1func -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1status_1icon_1position_1menu_1func) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1status_1icon_1position_1menu_1func) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1position_1menu_1func_FUNC); - rc = (jintLong)gtk_status_icon_position_menu_func(); + rc = (jlong)gtk_status_icon_position_menu_func(); GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1position_1menu_1func_FUNC); return rc; } @@ -9289,7 +8992,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1status_1icon_1position_1menu_1func) #ifndef NO__1gtk_1status_1icon_1set_1from_1pixbuf JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1from_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC); gtk_status_icon_set_from_pixbuf((GtkStatusIcon*)arg0, (GdkPixbuf*)arg1); @@ -9299,7 +9002,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1from_1pixbuf) #ifndef NO__1gtk_1status_1icon_1set_1tooltip_1text JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1tooltip_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1tooltip_1text_FUNC); @@ -9313,7 +9016,7 @@ fail: #ifndef NO__1gtk_1status_1icon_1set_1visible JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1visible) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1visible_FUNC); gtk_status_icon_set_visible((GtkStatusIcon*)arg0, (gboolean)arg1); @@ -9323,7 +9026,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1visible) #ifndef NO__1gtk_1style_1context_1add_1class JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1class) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1class_FUNC); @@ -9337,7 +9040,7 @@ fail: #ifndef NO__1gtk_1style_1context_1add_1provider JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1provider_FUNC); gtk_style_context_add_provider((GtkStyleContext *)arg0, (GtkStyleProvider *)arg1, (guint)arg2); @@ -9347,7 +9050,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider) #ifndef NO__1gtk_1style_1context_1add_1provider_1for_1display JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider_1for_1display) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1provider_1for_1display_FUNC); /* @@ -9365,7 +9068,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider_1for_1dis #ifndef NO__1gtk_1style_1context_1add_1provider_1for_1screen JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider_1for_1screen) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1provider_1for_1screen_FUNC); gtk_style_context_add_provider_for_screen((GdkScreen *)arg0, (GtkStyleProvider *)arg1, (guint)arg2); @@ -9373,81 +9076,59 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider_1for_1scr } #endif -#if (!defined(NO__1gtk_1style_1context_1get__II_3B_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get__JI_3B_3JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get__II_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jintLongArray arg3, jintLong arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get__JI_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jintLongArray arg3, jintLong arg4) -#endif +#ifndef NO__1gtk_1style_1context_1get__JI_3B_3JJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get__JI_3B_3JJ) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jlong arg4) { jbyte *lparg2=NULL; - jintLong *lparg3=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get__II_3B_3II_FUNC); -#else + jlong *lparg3=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get__JI_3B_3JJ_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* gtk_style_context_get(arg0, arg1, (const gchar *)lparg2, lparg3, (const gchar *)NULL); */ { GTK_LOAD_FUNCTION(fp, gtk_style_context_get) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint, const gchar *, jintLong *, const gchar *))fp)(arg0, arg1, (const gchar *)lparg2, lparg3, (const gchar *)NULL); + ((void (CALLING_CONVENTION*)(jlong, jint, const gchar *, jlong *, const gchar *))fp)(arg0, arg1, (const gchar *)lparg2, lparg3, (const gchar *)NULL); } } fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, JNI_ABORT); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get__II_3B_3II_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get__JI_3B_3JJ_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1style_1context_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get__J_3B_3JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2, jintLong arg3) -#endif +#ifndef NO__1gtk_1style_1context_1get__J_3B_3JJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get__J_3B_3JJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlongArray arg2, jlong arg3) { jbyte *lparg1=NULL; - jintLong *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get__I_3B_3II_FUNC); -#else + jlong *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get__J_3B_3JJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; /* gtk_style_context_get(arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); */ { GTK_LOAD_FUNCTION(fp, gtk_style_context_get) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, const gchar *, jintLong *, const gchar *))fp)(arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); + ((void (CALLING_CONVENTION*)(jlong, const gchar *, jlong *, const gchar *))fp)(arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); } } fail: - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); + if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get__I_3B_3II_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get__J_3B_3JJ_FUNC); -#endif } #endif #ifndef NO__1gtk_1style_1context_1get_1background_1color JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1background_1color) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GdkRGBA _arg2, *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1background_1color_FUNC); @@ -9458,7 +9139,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1background_1color) { GTK_LOAD_FUNCTION(fp, gtk_style_context_get_background_color) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2); } } fail: @@ -9467,19 +9148,12 @@ fail: } #endif -#if (!defined(NO__1gtk_1style_1context_1get_1border__IILorg_eclipse_swt_internal_gtk_GtkBorder_2) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__IILorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#endif +#ifndef NO__1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2 +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GtkBorder _arg2, *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1border__IILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail; /* gtk_style_context_get_border((GtkStyleContext *)arg0, (GtkStateFlags)arg1, (GtkBorder *)lparg2); @@ -9492,27 +9166,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__JILorg_ecl } fail: if (arg2 && lparg2) setGtkBorderFields(env, arg2, lparg2); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1border__IILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1style_1context_1get_1border__ILorg_eclipse_swt_internal_gtk_GtkBorder_2) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__ILorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO__1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2 +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GtkBorder _arg1, *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1border__ILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail; /* gtk_style_context_get_border((GtkStyleContext *)arg0, (GtkBorder *)lparg1); @@ -9525,27 +9188,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border__JLorg_ecli } fail: if (arg1 && lparg1) setGtkBorderFields(env, arg1, lparg1); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1border__ILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1style_1context_1get_1color__IILorg_eclipse_swt_internal_gtk_GdkRGBA_2) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__IILorg_eclipse_swt_internal_gtk_GdkRGBA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#endif +#ifndef NO__1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2 +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GdkRGBA _arg2, *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1color__IILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#endif if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail; /* gtk_style_context_get_color((GtkStyleContext *)arg0, (GtkStateFlags)arg1, (GdkRGBA *)lparg2); @@ -9558,27 +9210,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__JILorg_ecli } fail: if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1color__IILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1style_1context_1get_1color__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO__1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2 +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRGBA _arg1, *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1color__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#endif if (arg1) if ((lparg1 = getGdkRGBAFields(env, arg1, &_arg1)) == NULL) goto fail; /* gtk_style_context_get_color((GtkStyleContext *)arg0, (GdkRGBA *)lparg1); @@ -9591,27 +9232,23 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color__JLorg_eclip } fail: if (arg1 && lparg1) setGdkRGBAFields(env, arg1, lparg1); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1color__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC); -#endif } #endif #ifndef NO__1gtk_1style_1context_1get_1font -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1font) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1font) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1font_FUNC); /* - rc = (jintLong)gtk_style_context_get_font(arg0, arg1); + rc = (jlong)gtk_style_context_get_font(arg0, arg1); */ { GTK_LOAD_FUNCTION(fp, gtk_style_context_get_font) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1font_FUNC); @@ -9633,19 +9270,12 @@ fail: } #endif -#if (!defined(NO__1gtk_1style_1context_1get_1padding__IILorg_eclipse_swt_internal_gtk_GtkBorder_2) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__IILorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#endif +#ifndef NO__1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2 +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GtkBorder _arg2, *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1padding__IILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail; /* gtk_style_context_get_padding((GtkStyleContext *)arg0, (GtkStateFlags)arg1, (GtkBorder *)lparg2); @@ -9658,27 +9288,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__JILorg_ec } fail: if (arg2 && lparg2) setGtkBorderFields(env, arg2, lparg2); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1padding__IILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1style_1context_1get_1padding__ILorg_eclipse_swt_internal_gtk_GtkBorder_2) && !defined(JNI64)) || (!defined(NO__1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__ILorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO__1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2 +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GtkBorder _arg1, *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1padding__ILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail; /* gtk_style_context_get_padding((GtkStyleContext *)arg0, (GtkBorder *)lparg1); @@ -9691,17 +9310,13 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding__JLorg_ecl } fail: if (arg1 && lparg1) setGtkBorderFields(env, arg1, lparg1); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1padding__ILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC); -#endif } #endif #ifndef NO__1gtk_1style_1context_1invalidate JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1invalidate) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1invalidate_FUNC); /* @@ -9710,7 +9325,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1invalidate) { GTK_LOAD_FUNCTION(fp, gtk_style_context_invalidate) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1invalidate_FUNC); @@ -9719,7 +9334,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1invalidate) #ifndef NO__1gtk_1style_1context_1remove_1class JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1remove_1class) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1remove_1class_FUNC); @@ -9733,7 +9348,7 @@ fail: #ifndef NO__1gtk_1style_1context_1restore JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1restore) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1restore_FUNC); gtk_style_context_restore((GtkStyleContext *)arg0); @@ -9743,7 +9358,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1restore) #ifndef NO__1gtk_1style_1context_1save JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1save) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1save_FUNC); gtk_style_context_save((GtkStyleContext *)arg0); @@ -9753,7 +9368,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1save) #ifndef NO__1gtk_1style_1context_1set_1state JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1set_1state) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1set_1state_FUNC); gtk_style_context_set_state((GtkStyleContext *)arg0, (GtkStateFlags)arg1); @@ -9762,12 +9377,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1set_1state) #endif #ifndef NO__1gtk_1target_1list_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1target_1list_1new) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1target_1list_1new) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1target_1list_1new_FUNC); - rc = (jintLong)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1); + rc = (jlong)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1target_1list_1new_FUNC); return rc; } @@ -9775,7 +9390,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1target_1list_1new) #ifndef NO__1gtk_1target_1list_1unref JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1target_1list_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1target_1list_1unref_FUNC); gtk_target_list_unref((GtkTargetList *)arg0); @@ -9785,7 +9400,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1target_1list_1unref) #ifndef NO__1gtk_1text_1buffer_1copy_1clipboard JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC); /* @@ -9794,7 +9409,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard) { GTK_LOAD_FUNCTION(fp, gtk_text_buffer_copy_clipboard) if (fp) { - ((void (CALLING_CONVENTION*)(GtkTextBuffer *, jintLong))fp)((GtkTextBuffer *)arg0, arg1); + ((void (CALLING_CONVENTION*)(GtkTextBuffer *, jlong))fp)((GtkTextBuffer *)arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC); @@ -9802,16 +9417,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard) #endif #ifndef NO__1gtk_1text_1buffer_1create_1mark -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1create_1mark) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1create_1mark) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1create_1mark_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_text_buffer_create_mark((GtkTextBuffer *)arg0, (const gchar *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3); + rc = (jlong)gtk_text_buffer_create_mark((GtkTextBuffer *)arg0, (const gchar *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3); fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -9822,7 +9437,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1cut_1clipboard JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC); /* @@ -9831,7 +9446,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard) { GTK_LOAD_FUNCTION(fp, gtk_text_buffer_cut_clipboard) if (fp) { - ((void (CALLING_CONVENTION*)(GtkTextBuffer *, jintLong, gboolean))fp)((GtkTextBuffer *)arg0, arg1, (gboolean)arg2); + ((void (CALLING_CONVENTION*)(GtkTextBuffer *, jlong, gboolean))fp)((GtkTextBuffer *)arg0, arg1, (gboolean)arg2); } } GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC); @@ -9840,7 +9455,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard) #ifndef NO__1gtk_1text_1buffer_1delete JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1delete) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -9857,7 +9472,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1get_1bounds JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1bounds) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -9874,7 +9489,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1get_1end_1iter JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1end_1iter) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC); @@ -9887,12 +9502,12 @@ fail: #endif #ifndef NO__1gtk_1text_1buffer_1get_1insert -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1insert) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1insert) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC); - rc = (jintLong)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0); + rc = (jlong)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC); return rc; } @@ -9900,7 +9515,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1insert) #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1line JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1line) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC); @@ -9914,7 +9529,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1mark JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1mark) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC); @@ -9928,7 +9543,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1offset JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1offset) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC); @@ -9942,7 +9557,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1get_1line_1count JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1line_1count) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC); @@ -9953,12 +9568,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1line_1count) #endif #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bound -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC); - rc = (jintLong)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0); + rc = (jlong)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC); return rc; } @@ -9966,7 +9581,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bounds JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bounds) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -9984,16 +9599,16 @@ fail: #endif #ifndef NO__1gtk_1text_1buffer_1get_1text -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1text) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1text_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3); + rc = (jlong)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3); fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -10002,62 +9617,40 @@ fail: } #endif -#if (!defined(NO__1gtk_1text_1buffer_1insert__II_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__JJ_3BI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__JJ_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3) -#endif +#ifndef NO__1gtk_1text_1buffer_1insert__JJ_3BI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__JJ_3BI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jint arg3) { jbyte *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)arg1, (const gchar *)lparg2, (gint)arg3); fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1text_1buffer_1insert__I_3B_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__J_3B_3BI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__J_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3) -#endif +#ifndef NO__1gtk_1text_1buffer_1insert__J_3B_3BI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__J_3B_3BI) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (const gchar *)lparg2, (gint)arg3); fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC); -#endif } #endif #ifndef NO__1gtk_1text_1buffer_1paste_1clipboard JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1paste_1clipboard) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jboolean arg3) { jbyte *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC); @@ -10068,7 +9661,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1paste_1clipboard) { GTK_LOAD_FUNCTION(fp, gtk_text_buffer_paste_clipboard) if (fp) { - ((void (CALLING_CONVENTION*)(GtkTextBuffer *, jintLong, GtkTextIter *, gboolean))fp)((GtkTextBuffer *)arg0, arg1, (GtkTextIter *)lparg2, (gboolean)arg3); + ((void (CALLING_CONVENTION*)(GtkTextBuffer *, jlong, GtkTextIter *, gboolean))fp)((GtkTextBuffer *)arg0, arg1, (GtkTextIter *)lparg2, (gboolean)arg3); } } fail: @@ -10079,7 +9672,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1place_1cursor JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1place_1cursor) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC); @@ -10093,7 +9686,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1select_1range JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1select_1range) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -10110,7 +9703,7 @@ fail: #ifndef NO__1gtk_1text_1buffer_1set_1text JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1set_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1set_1text_FUNC); @@ -10156,7 +9749,7 @@ fail: #ifndef NO__1gtk_1text_1view_1buffer_1to_1surface_1coords JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1buffer_1to_1surface_1coords) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5) { jint *lparg4=NULL; jint *lparg5=NULL; @@ -10181,7 +9774,7 @@ fail: #ifndef NO__1gtk_1text_1view_1buffer_1to_1window_1coords JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1buffer_1to_1window_1coords) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5) { jint *lparg4=NULL; jint *lparg5=NULL; @@ -10205,12 +9798,12 @@ fail: #endif #ifndef NO__1gtk_1text_1view_1get_1buffer -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1buffer) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1buffer) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1buffer_FUNC); - rc = (jintLong)gtk_text_view_get_buffer((GtkTextView *)arg0); + rc = (jlong)gtk_text_view_get_buffer((GtkTextView *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1buffer_FUNC); return rc; } @@ -10218,7 +9811,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1buffer) #ifndef NO__1gtk_1text_1view_1get_1editable JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1editable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1editable_FUNC); @@ -10230,7 +9823,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1editable) #ifndef NO__1gtk_1text_1view_1get_1iter_1at_1location JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1iter_1at_1location) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jint arg3) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC); @@ -10244,7 +9837,7 @@ fail: #ifndef NO__1gtk_1text_1view_1get_1iter_1location JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1iter_1location) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jobject arg2) { jbyte *lparg1=NULL; GdkRectangle _arg2, *lparg2=NULL; @@ -10261,7 +9854,7 @@ fail: #ifndef NO__1gtk_1text_1view_1get_1line_1at_1y JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1line_1at_1y) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jintArray arg3) { jbyte *lparg1=NULL; jint *lparg3=NULL; @@ -10278,7 +9871,7 @@ fail: #ifndef NO__1gtk_1text_1view_1get_1line_1yrange JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1line_1yrange) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintArray arg2, jintArray arg3) { jbyte *lparg1=NULL; jint *lparg2=NULL; @@ -10298,7 +9891,7 @@ fail: #ifndef NO__1gtk_1text_1view_1get_1visible_1rect JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1visible_1rect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC); @@ -10311,24 +9904,24 @@ fail: #endif #ifndef NO__1gtk_1text_1view_1get_1window -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1window) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1window) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1window_FUNC); - rc = (jintLong)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1); + rc = (jlong)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1window_FUNC); return rc; } #endif #ifndef NO__1gtk_1text_1view_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1text_1view_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1new_FUNC); - rc = (jintLong)gtk_text_view_new(); + rc = (jlong)gtk_text_view_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1new_FUNC); return rc; } @@ -10336,7 +9929,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1new) #ifndef NO__1gtk_1text_1view_1scroll_1to_1iter JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1text_1view_1scroll_1to_1iter) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5) { jbyte *lparg1=NULL; jboolean rc = 0; @@ -10352,7 +9945,7 @@ fail: #ifndef NO__1gtk_1text_1view_1scroll_1to_1mark JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1scroll_1to_1mark) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5) { GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1to_1mark_FUNC); gtk_text_view_scroll_to_mark((GtkTextView *)arg0, (GtkTextMark *)arg1, (gdouble)arg2, (gboolean)arg3, (gdouble)arg4, (gdouble)arg5); @@ -10362,7 +9955,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1scroll_1to_1mark) #ifndef NO__1gtk_1text_1view_1set_1editable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1editable) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1editable_FUNC); gtk_text_view_set_editable((GtkTextView *)arg0, (gboolean)arg1); @@ -10372,7 +9965,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1editable) #ifndef NO__1gtk_1text_1view_1set_1justification JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1justification) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1justification_FUNC); gtk_text_view_set_justification((GtkTextView *)arg0, arg1); @@ -10382,7 +9975,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1justification) #ifndef NO__1gtk_1text_1view_1set_1tabs JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1tabs) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1tabs_FUNC); gtk_text_view_set_tabs((GtkTextView *)arg0, (PangoTabArray *)arg1); @@ -10392,7 +9985,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1tabs) #ifndef NO__1gtk_1text_1view_1set_1wrap_1mode JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC); gtk_text_view_set_wrap_mode((GtkTextView *)arg0, arg1); @@ -10402,7 +9995,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode) #ifndef NO__1gtk_1toggle_1button_1get_1active JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1get_1active) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1active_FUNC); @@ -10413,12 +10006,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1get_1active) #endif #ifndef NO__1gtk_1toggle_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1new_FUNC); - rc = (jintLong)gtk_toggle_button_new(); + rc = (jlong)gtk_toggle_button_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1new_FUNC); return rc; } @@ -10426,7 +10019,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1new) #ifndef NO__1gtk_1toggle_1button_1set_1active JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1active) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1active_FUNC); gtk_toggle_button_set_active((GtkToggleButton *)arg0, (gboolean)arg1); @@ -10436,7 +10029,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1active) #ifndef NO__1gtk_1toggle_1button_1set_1inconsistent JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC); /* @@ -10454,7 +10047,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent) #ifndef NO__1gtk_1toggle_1button_1set_1mode JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1mode) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC); /* @@ -10472,7 +10065,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1mode) #ifndef NO__1gtk_1toggle_1tool_1button_1get_1active JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1get_1active) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1get_1active_FUNC); @@ -10483,12 +10076,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1get_1active) #endif #ifndef NO__1gtk_1toggle_1tool_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1new_FUNC); - rc = (jintLong)gtk_toggle_tool_button_new(); + rc = (jlong)gtk_toggle_tool_button_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1tool_1button_1new_FUNC); return rc; } @@ -10496,7 +10089,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1new) #ifndef NO__1gtk_1toggle_1tool_1button_1set_1active JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1set_1active) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1set_1active_FUNC); gtk_toggle_tool_button_set_active((GtkToggleToolButton *)arg0, (gboolean)arg1); @@ -10505,14 +10098,14 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1set_1active) #endif #ifndef NO__1gtk_1tool_1button_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tool_1button_1new) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tool_1button_1new) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1new_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_tool_button_new((GtkWidget *)arg0, (const gchar *)lparg1); + rc = (jlong)gtk_tool_button_new((GtkWidget *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1new_FUNC); @@ -10522,7 +10115,7 @@ fail: #ifndef NO__1gtk_1tool_1button_1set_1icon_1widget JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1icon_1widget) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1icon_1widget_FUNC); gtk_tool_button_set_icon_widget((GtkToolButton *)arg0, (GtkWidget *)arg1); @@ -10532,7 +10125,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1icon_1widget) #ifndef NO__1gtk_1tool_1button_1set_1label JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1label) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1label_FUNC); @@ -10546,7 +10139,7 @@ fail: #ifndef NO__1gtk_1tool_1button_1set_1label_1widget JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1label_1widget) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1label_1widget_FUNC); gtk_tool_button_set_label_widget((GtkToolButton *)arg0, (GtkWidget *)arg1); @@ -10556,7 +10149,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1label_1widget) #ifndef NO__1gtk_1tool_1button_1set_1use_1underline JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1use_1underline) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1use_1underline_FUNC); gtk_tool_button_set_use_underline((GtkToolButton *)arg0, (gboolean)arg1); @@ -10565,14 +10158,14 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1use_1underline) #endif #ifndef NO__1gtk_1tool_1item_1get_1proxy_1menu_1item -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tool_1item_1get_1proxy_1menu_1item) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tool_1item_1get_1proxy_1menu_1item) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1get_1proxy_1menu_1item_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_tool_item_get_proxy_menu_item((GtkToolItem *)arg0, (const gchar *)lparg1); + rc = (jlong)gtk_tool_item_get_proxy_menu_item((GtkToolItem *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1get_1proxy_1menu_1item_FUNC); @@ -10581,12 +10174,12 @@ fail: #endif #ifndef NO__1gtk_1tool_1item_1retrieve_1proxy_1menu_1item -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tool_1item_1retrieve_1proxy_1menu_1item) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tool_1item_1retrieve_1proxy_1menu_1item) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1retrieve_1proxy_1menu_1item_FUNC); - rc = (jintLong)gtk_tool_item_retrieve_proxy_menu_item((GtkToolItem *)arg0); + rc = (jlong)gtk_tool_item_retrieve_proxy_menu_item((GtkToolItem *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1retrieve_1proxy_1menu_1item_FUNC); return rc; } @@ -10594,7 +10187,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tool_1item_1retrieve_1proxy_1menu_1 #ifndef NO__1gtk_1tool_1item_1set_1is_1important JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1item_1set_1is_1important) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1set_1is_1important_FUNC); gtk_tool_item_set_is_important((GtkToolItem *)arg0, (gboolean)arg1); @@ -10604,7 +10197,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1item_1set_1is_1important) #ifndef NO__1gtk_1tool_1item_1set_1proxy_1menu_1item JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1item_1set_1proxy_1menu_1item) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1set_1proxy_1menu_1item_FUNC); @@ -10618,7 +10211,7 @@ fail: #ifndef NO__1gtk_1toolbar_1insert JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1insert) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1insert_FUNC); gtk_toolbar_insert((GtkToolbar *)arg0, (GtkToolItem *)arg1, arg2); @@ -10627,12 +10220,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1insert) #endif #ifndef NO__1gtk_1toolbar_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toolbar_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1toolbar_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1new_FUNC); - rc = (jintLong)gtk_toolbar_new(); + rc = (jlong)gtk_toolbar_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1toolbar_1new_FUNC); return rc; } @@ -10640,7 +10233,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toolbar_1new) #ifndef NO__1gtk_1toolbar_1set_1icon_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1icon_1size) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1icon_1size_FUNC); /* @@ -10658,7 +10251,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1icon_1size) #ifndef NO__1gtk_1toolbar_1set_1show_1arrow JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1show_1arrow) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1show_1arrow_FUNC); gtk_toolbar_set_show_arrow((GtkToolbar *)arg0, (gboolean)arg1); @@ -10668,7 +10261,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1show_1arrow) #ifndef NO__1gtk_1toolbar_1set_1style JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1style) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1style_FUNC); gtk_toolbar_set_style((GtkToolbar *)arg0, (GtkToolbarStyle)arg1); @@ -10676,59 +10269,37 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1style) } #endif -#if (!defined(NO__1gtk_1tree_1model_1get__III_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3II) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__III_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__JJI_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4) -#endif +#ifndef NO__1gtk_1tree_1model_1get__JJI_3II +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__JJI_3II) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintArray arg3, jint arg4) { jint *lparg3=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3II_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3II_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1tree_1model_1get__III_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__III_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__JJI_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4) -#endif +#ifndef NO__1gtk_1tree_1model_1get__JJI_3JI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__JJI_3JI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3, jint arg4) { jlong *lparg3=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3JI_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4); fail: if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3JI_FUNC); -#endif } #endif #ifndef NO__1gtk_1tree_1model_1get_1iter JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1iter) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_FUNC); @@ -10740,7 +10311,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1iter) #ifndef NO__1gtk_1tree_1model_1get_1iter_1first JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1iter_1first) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC); @@ -10752,7 +10323,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1iter_1first) #ifndef NO__1gtk_1tree_1model_1get_1n_1columns JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1n_1columns) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC); @@ -10763,24 +10334,24 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1n_1columns) #endif #ifndef NO__1gtk_1tree_1model_1get_1path -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1path) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1path) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1path_FUNC); - rc = (jintLong)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1); + rc = (jlong)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1path_FUNC); return rc; } #endif #ifndef NO__1gtk_1tree_1model_1get_1type -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1type) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1type_FUNC); - rc = (jintLong)gtk_tree_model_get_type(); + rc = (jlong)gtk_tree_model_get_type(); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1type_FUNC); return rc; } @@ -10788,7 +10359,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1type) #ifndef NO__1gtk_1tree_1model_1iter_1children JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1children) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1children_FUNC); @@ -10800,7 +10371,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1children) #ifndef NO__1gtk_1tree_1model_1iter_1n_1children JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1n_1children) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC); @@ -10812,7 +10383,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1n_1children) #ifndef NO__1gtk_1tree_1model_1iter_1next JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1next) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1next_FUNC); @@ -10824,7 +10395,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1next) #ifndef NO__1gtk_1tree_1model_1iter_1nth_1child JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC); @@ -10836,7 +10407,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child) #ifndef NO__1gtk_1tree_1path_1append_1index JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1append_1index) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1append_1index_FUNC); gtk_tree_path_append_index((GtkTreePath *)arg0, arg1); @@ -10845,12 +10416,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1append_1index) #endif #ifndef NO__1gtk_1tree_1path_1compare -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1compare) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1compare) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1compare_FUNC); - rc = (jintLong)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1); + rc = (jlong)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1compare_FUNC); return rc; } @@ -10858,7 +10429,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1compare) #ifndef NO__1gtk_1tree_1path_1free JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1free_FUNC); gtk_tree_path_free((GtkTreePath *)arg0); @@ -10868,7 +10439,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1free) #ifndef NO__1gtk_1tree_1path_1get_1depth JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1path_1get_1depth) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1depth_FUNC); @@ -10879,61 +10450,50 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1path_1get_1depth) #endif #ifndef NO__1gtk_1tree_1path_1get_1indices -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1get_1indices) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1get_1indices) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1indices_FUNC); - rc = (jintLong)gtk_tree_path_get_indices((GtkTreePath *)arg0); + rc = (jlong)gtk_tree_path_get_indices((GtkTreePath *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1indices_FUNC); return rc; } #endif #ifndef NO__1gtk_1tree_1path_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_FUNC); - rc = (jintLong)gtk_tree_path_new(); + rc = (jlong)gtk_tree_path_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_FUNC); return rc; } #endif -#if (!defined(NO__1gtk_1tree_1path_1new_1from_1string__I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1path_1new_1from_1string__J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)(JNIEnv *env, jclass that, jintLong arg0) -#else -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string__J)(JNIEnv *env, jclass that, jintLong arg0) -#endif +#ifndef NO__1gtk_1tree_1path_1new_1from_1string__J +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string__J) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC); -#else + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC); -#endif - rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)arg0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC); -#else + rc = (jlong)gtk_tree_path_new_from_string((const gchar *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC); -#endif return rc; } #endif #ifndef NO__1gtk_1tree_1path_1new_1from_1string___3B -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)lparg0); + rc = (jlong)gtk_tree_path_new_from_string((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC); @@ -10943,7 +10503,7 @@ fail: #ifndef NO__1gtk_1tree_1path_1next JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1next) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1next_FUNC); gtk_tree_path_next((GtkTreePath *)arg0); @@ -10953,7 +10513,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1next) #ifndef NO__1gtk_1tree_1path_1prev JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1path_1prev) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1prev_FUNC); @@ -10965,7 +10525,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1path_1prev) #ifndef NO__1gtk_1tree_1path_1up JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1path_1up) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1up_FUNC); @@ -10977,7 +10537,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1path_1up) #ifndef NO__1gtk_1tree_1selection_1count_1selected_1rows JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC); @@ -10988,26 +10548,26 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows) #endif #ifndef NO__1gtk_1tree_1selection_1get_1select_1function -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1select_1function) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1select_1function) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1select_1function_FUNC); - rc = (jintLong)gtk_tree_selection_get_select_function((GtkTreeSelection *)arg0); + rc = (jlong)gtk_tree_selection_get_select_function((GtkTreeSelection *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1select_1function_FUNC); return rc; } #endif #ifndef NO__1gtk_1tree_1selection_1get_1selected_1rows -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1) { jintLong *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC); if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1); + rc = (jlong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC); @@ -11017,7 +10577,7 @@ fail: #ifndef NO__1gtk_1tree_1selection_1path_1is_1selected JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC); @@ -11029,7 +10589,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected #ifndef NO__1gtk_1tree_1selection_1select_1all JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1all) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1all_FUNC); gtk_tree_selection_select_all((GtkTreeSelection *)arg0); @@ -11039,7 +10599,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1all) #ifndef NO__1gtk_1tree_1selection_1select_1iter JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1iter) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC); gtk_tree_selection_select_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1); @@ -11049,7 +10609,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1iter) #ifndef NO__1gtk_1tree_1selection_1select_1path JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1path) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1path_FUNC); gtk_tree_selection_select_path((GtkTreeSelection *)arg0, (GtkTreePath *)arg1); @@ -11059,7 +10619,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1path) #ifndef NO__1gtk_1tree_1selection_1set_1mode JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1set_1mode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC); gtk_tree_selection_set_mode((GtkTreeSelection *)arg0, (GtkSelectionMode)arg1); @@ -11069,7 +10629,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1set_1mode) #ifndef NO__1gtk_1tree_1selection_1set_1select_1function JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1set_1select_1function) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1select_1function_FUNC); gtk_tree_selection_set_select_function((GtkTreeSelection *)arg0, (GtkTreeSelectionFunc)arg1, (gpointer)arg2, (GDestroyNotify)arg3); @@ -11079,7 +10639,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1set_1select_1function) #ifndef NO__1gtk_1tree_1selection_1unselect_1all JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1all) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC); gtk_tree_selection_unselect_all((GtkTreeSelection *)arg0); @@ -11089,7 +10649,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1all) #ifndef NO__1gtk_1tree_1selection_1unselect_1iter JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1iter) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC); gtk_tree_selection_unselect_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1); @@ -11099,7 +10659,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1iter) #ifndef NO__1gtk_1tree_1selection_1unselect_1path JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1path) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1path_FUNC); gtk_tree_selection_unselect_path((GtkTreeSelection *)arg0, (GtkTreePath *)arg1); @@ -11109,7 +10669,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1path) #ifndef NO__1gtk_1tree_1store_1append JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1append) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1append_FUNC); gtk_tree_store_append((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2); @@ -11119,7 +10679,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1append) #ifndef NO__1gtk_1tree_1store_1clear JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1clear) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1clear_FUNC); gtk_tree_store_clear((GtkTreeStore *)arg0); @@ -11129,7 +10689,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1clear) #ifndef NO__1gtk_1tree_1store_1insert JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1insert) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1insert_FUNC); gtk_tree_store_insert((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2, (gint)arg3); @@ -11138,14 +10698,14 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1insert) #endif #ifndef NO__1gtk_1tree_1store_1newv -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1store_1newv) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1store_1newv) (JNIEnv *env, jclass that, jint arg0, jintLongArray arg1) { jintLong *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1newv_FUNC); if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_tree_store_newv(arg0, (GType *)lparg1); + rc = (jlong)gtk_tree_store_newv(arg0, (GType *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1newv_FUNC); @@ -11155,7 +10715,7 @@ fail: #ifndef NO__1gtk_1tree_1store_1remove JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1remove) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1remove_FUNC); gtk_tree_store_remove((GtkTreeStore *)arg0, (GtkTreeIter *)arg1); @@ -11163,121 +10723,66 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1remove) } #endif -#if (!defined(NO__1gtk_1tree_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) -#endif +#ifndef NO__1gtk_1tree_1store_1set__JJIII +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIII_FUNC); -#endif gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIII_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1tree_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4) -#endif +#ifndef NO__1gtk_1tree_1store_1set__JJIJI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIJI_FUNC); -#endif gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIJI_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4) -#endif +#ifndef NO__1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jint arg4) { GdkRGBA _arg3, *lparg3=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#endif if (arg3) if ((lparg3 = getGdkRGBAFields(env, arg3, &_arg3)) == NULL) goto fail; gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4); fail: -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1tree_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIZI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4) -#endif +#ifndef NO__1gtk_1tree_1store_1set__JJIZI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIZI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3, jint arg4) { -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIZI_FUNC); -#endif gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIZI_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1tree_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJI_3BI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4) -#endif +#ifndef NO__1gtk_1tree_1store_1set__JJI_3BI +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJI_3BI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4) { jbyte *lparg3=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJI_3BI_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4); fail: if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJI_3BI_FUNC); -#endif } #endif #ifndef NO__1gtk_1tree_1view_1collapse_1row JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1collapse_1row) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC); @@ -11289,7 +10794,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1collapse_1row) #ifndef NO__1gtk_1tree_1view_1column_1add_1attribute JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1add_1attribute) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jint arg3) { jbyte *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC); @@ -11303,7 +10808,7 @@ fail: #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1position JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1position) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jintArray arg3) { jint *lparg2=NULL; jint *lparg3=NULL; @@ -11322,7 +10827,7 @@ fail: #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1size) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5) { GdkRectangle _arg1, *lparg1=NULL; jint *lparg2=NULL; @@ -11348,7 +10853,7 @@ fail: #ifndef NO__1gtk_1tree_1view_1column_1cell_1set_1cell_1data JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jboolean arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3, jboolean arg4) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC); gtk_tree_view_column_cell_set_cell_data((GtkTreeViewColumn *)arg0, (GtkTreeModel *)arg1, (GtkTreeIter *)arg2, arg3, arg4); @@ -11358,7 +10863,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1da #ifndef NO__1gtk_1tree_1view_1column_1clear JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1clear) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1clear_FUNC); gtk_tree_view_column_clear((GtkTreeViewColumn *)arg0); @@ -11368,7 +10873,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1clear) #ifndef NO__1gtk_1tree_1view_1column_1get_1button JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1button) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jintLong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1button_FUNC); @@ -11380,7 +10885,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1button) #ifndef NO__1gtk_1tree_1view_1column_1get_1fixed_1width JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC); @@ -11392,7 +10897,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width) #ifndef NO__1gtk_1tree_1view_1column_1get_1reorderable JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC); @@ -11404,7 +10909,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderabl #ifndef NO__1gtk_1tree_1view_1column_1get_1resizable JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC); @@ -11416,7 +10921,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable) #ifndef NO__1gtk_1tree_1view_1column_1get_1visible JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1visible) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC); @@ -11428,7 +10933,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1visible) #ifndef NO__1gtk_1tree_1view_1column_1get_1width JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC); @@ -11439,12 +10944,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1width) #endif #ifndef NO__1gtk_1tree_1view_1column_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1new_FUNC); - rc = (jintLong)gtk_tree_view_column_new(); + rc = (jlong)gtk_tree_view_column_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1new_FUNC); return rc; } @@ -11452,7 +10957,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1new) #ifndef NO__1gtk_1tree_1view_1column_1pack_1end JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1pack_1end) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC); gtk_tree_view_column_pack_end((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2); @@ -11462,7 +10967,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1pack_1end) #ifndef NO__1gtk_1tree_1view_1column_1pack_1start JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1pack_1start) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC); gtk_tree_view_column_pack_start((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2); @@ -11472,7 +10977,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1pack_1start) #ifndef NO__1gtk_1tree_1view_1column_1set_1alignment JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC); gtk_tree_view_column_set_alignment((GtkTreeViewColumn *)arg0, arg1); @@ -11482,7 +10987,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment) #ifndef NO__1gtk_1tree_1view_1column_1set_1cell_1data_1func JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1func) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC); gtk_tree_view_column_set_cell_data_func((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (GtkTreeCellDataFunc)arg2, (gpointer)arg3, (GDestroyNotify)arg4); @@ -11492,7 +10997,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1fu #ifndef NO__1gtk_1tree_1view_1column_1set_1clickable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC); gtk_tree_view_column_set_clickable((GtkTreeViewColumn *)arg0, (gboolean)arg1); @@ -11502,7 +11007,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable) #ifndef NO__1gtk_1tree_1view_1column_1set_1fixed_1width JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC); gtk_tree_view_column_set_fixed_width((GtkTreeViewColumn *)arg0, (gint)arg1); @@ -11512,7 +11017,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width) #ifndef NO__1gtk_1tree_1view_1column_1set_1min_1width JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC); gtk_tree_view_column_set_min_width((GtkTreeViewColumn *)arg0, (gint)arg1); @@ -11522,7 +11027,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width) #ifndef NO__1gtk_1tree_1view_1column_1set_1reorderable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC); gtk_tree_view_column_set_reorderable((GtkTreeViewColumn *)arg0, (gboolean)arg1); @@ -11532,7 +11037,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable) #ifndef NO__1gtk_1tree_1view_1column_1set_1resizable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC); gtk_tree_view_column_set_resizable((GtkTreeViewColumn *)arg0, (gboolean)arg1); @@ -11542,7 +11047,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable) #ifndef NO__1gtk_1tree_1view_1column_1set_1sizing JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC); gtk_tree_view_column_set_sizing((GtkTreeViewColumn *)arg0, (GtkTreeViewColumnSizing)arg1); @@ -11552,7 +11057,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing) #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1indicator JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC); gtk_tree_view_column_set_sort_indicator((GtkTreeViewColumn *)arg0, (gboolean)arg1); @@ -11562,7 +11067,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicato #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1order JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC); gtk_tree_view_column_set_sort_order((GtkTreeViewColumn *)arg0, (GtkSortType)arg1); @@ -11572,7 +11077,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order) #ifndef NO__1gtk_1tree_1view_1column_1set_1visible JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1visible) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC); gtk_tree_view_column_set_visible((GtkTreeViewColumn *)arg0, arg1); @@ -11582,7 +11087,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1visible) #ifndef NO__1gtk_1tree_1view_1column_1set_1widget JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1widget) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC); gtk_tree_view_column_set_widget((GtkTreeViewColumn *)arg0, (GtkWidget *)arg1); @@ -11592,7 +11097,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1widget) #ifndef NO__1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4) { jint *lparg3=NULL; jint *lparg4=NULL; @@ -11608,12 +11113,12 @@ fail: #endif #ifndef NO__1gtk_1tree_1view_1create_1row_1drag_1icon -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC); - rc = (jintLong)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1); + rc = (jlong)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC); return rc; } @@ -11621,7 +11126,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon #ifndef NO__1gtk_1tree_1view_1expand_1row JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1expand_1row) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1expand_1row_FUNC); @@ -11633,7 +11138,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1expand_1row) #ifndef NO__1gtk_1tree_1view_1get_1background_1area JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1background_1area) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3) { GdkRectangle _arg3, *lparg3=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC); @@ -11646,12 +11151,12 @@ fail: #endif #ifndef NO__1gtk_1tree_1view_1get_1bin_1window -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1bin_1window) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1bin_1window) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC); - rc = (jintLong)gtk_tree_view_get_bin_window((GtkTreeView *)arg0); + rc = (jlong)gtk_tree_view_get_bin_window((GtkTreeView *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC); return rc; } @@ -11659,7 +11164,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1bin_1window) #ifndef NO__1gtk_1tree_1view_1get_1cell_1area JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1cell_1area) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3) { GdkRectangle _arg3, *lparg3=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC); @@ -11672,24 +11177,24 @@ fail: #endif #ifndef NO__1gtk_1tree_1view_1get_1column -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1column) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1column) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1column_FUNC); - rc = (jintLong)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1); + rc = (jlong)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1column_FUNC); return rc; } #endif #ifndef NO__1gtk_1tree_1view_1get_1columns -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1columns) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1columns) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1columns_FUNC); - rc = (jintLong)gtk_tree_view_get_columns((GtkTreeView *)arg0); + rc = (jlong)gtk_tree_view_get_columns((GtkTreeView *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1columns_FUNC); return rc; } @@ -11697,17 +11202,17 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1columns) #ifndef NO__1gtk_1tree_1view_1get_1cursor JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1cursor) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2) { jintLong *lparg1=NULL; jintLong *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; gtk_tree_view_get_cursor((GtkTreeView *)arg0, (GtkTreePath **)lparg1, (GtkTreeViewColumn **)lparg2); fail: - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC); } #endif @@ -11714,7 +11219,7 @@ fail: #ifndef NO__1gtk_1tree_1view_1get_1expander_1column JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1expander_1column) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jintLong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC); @@ -11726,7 +11231,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1expander_1column) #ifndef NO__1gtk_1tree_1view_1get_1grid_1lines JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1grid_1lines) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1grid_1lines_FUNC); @@ -11738,7 +11243,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1grid_1lines) #ifndef NO__1gtk_1tree_1view_1get_1headers_1visible JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC); @@ -11750,7 +11255,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible) #ifndef NO__1gtk_1tree_1view_1get_1path_1at_1pos JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintArray arg6) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintArray arg6) { jintLong *lparg3=NULL; jintLong *lparg4=NULL; @@ -11774,12 +11279,12 @@ fail: #endif #ifndef NO__1gtk_1tree_1view_1get_1selection -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1selection) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1selection) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1selection_FUNC); - rc = (jintLong)gtk_tree_view_get_selection((GtkTreeView *)arg0); + rc = (jlong)gtk_tree_view_get_selection((GtkTreeView *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1selection_FUNC); return rc; } @@ -11787,7 +11292,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1selection) #ifndef NO__1gtk_1tree_1view_1get_1visible_1rect JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1visible_1rect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC); @@ -11801,7 +11306,7 @@ fail: #ifndef NO__1gtk_1tree_1view_1insert_1column JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1insert_1column) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1insert_1column_FUNC); @@ -11813,7 +11318,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1insert_1column) #ifndef NO__1gtk_1tree_1view_1move_1column_1after JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1move_1column_1after) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC); gtk_tree_view_move_column_after((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1, (GtkTreeViewColumn *)arg2); @@ -11822,12 +11327,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1move_1column_1after) #endif #ifndef NO__1gtk_1tree_1view_1new_1with_1model -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1new_1with_1model) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1new_1with_1model) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC); - rc = (jintLong)gtk_tree_view_new_with_model((GtkTreeModel *)arg0); + rc = (jlong)gtk_tree_view_new_with_model((GtkTreeModel *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC); return rc; } @@ -11835,7 +11340,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1new_1with_1model) #ifndef NO__1gtk_1tree_1view_1remove_1column JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1remove_1column) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1remove_1column_FUNC); gtk_tree_view_remove_column((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1); @@ -11845,7 +11350,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1remove_1column) #ifndef NO__1gtk_1tree_1view_1row_1expanded JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1row_1expanded) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC); @@ -11857,7 +11362,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1row_1expanded) #ifndef NO__1gtk_1tree_1view_1scroll_1to_1cell JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jfloat arg4, jfloat arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3, jfloat arg4, jfloat arg5) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC); gtk_tree_view_scroll_to_cell((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, (gboolean)arg3, (gfloat)arg4, (gfloat)arg5); @@ -11867,7 +11372,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell) #ifndef NO__1gtk_1tree_1view_1scroll_1to_1point JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC); gtk_tree_view_scroll_to_point((GtkTreeView *)arg0, (gint)arg1, (gint)arg2); @@ -11877,7 +11382,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point) #ifndef NO__1gtk_1tree_1view_1set_1cursor JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1cursor) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC); gtk_tree_view_set_cursor((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, arg3); @@ -11887,7 +11392,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1cursor) #ifndef NO__1gtk_1tree_1view_1set_1drag_1dest_1row JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC); gtk_tree_view_set_drag_dest_row((GtkTreeView *)arg0, (GtkTreePath *)arg1, arg2); @@ -11897,7 +11402,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row) #ifndef NO__1gtk_1tree_1view_1set_1grid_1lines JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC); gtk_tree_view_set_grid_lines((GtkTreeView*)arg0, (GtkTreeViewGridLines)arg1); @@ -11907,7 +11412,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines) #ifndef NO__1gtk_1tree_1view_1set_1headers_1visible JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC); gtk_tree_view_set_headers_visible((GtkTreeView *)arg0, (gboolean)arg1); @@ -11917,7 +11422,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible) #ifndef NO__1gtk_1tree_1view_1set_1model JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1model) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1model_FUNC); gtk_tree_view_set_model((GtkTreeView *)arg0, (GtkTreeModel *)arg1); @@ -11927,7 +11432,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1model) #ifndef NO__1gtk_1tree_1view_1set_1search_1column JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1search_1column) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC); gtk_tree_view_set_search_column((GtkTreeView *)arg0, (gint)arg1); @@ -11937,7 +11442,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1search_1column) #ifndef NO__1gtk_1tree_1view_1unset_1rows_1drag_1dest JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC); gtk_tree_view_unset_rows_drag_dest((GtkTreeView *)arg0); @@ -11947,7 +11452,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest) #ifndef NO__1gtk_1viewport_1set_1shadow_1type JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1viewport_1set_1shadow_1type) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC); gtk_viewport_set_shadow_type((GtkViewport *)arg0, (GtkShadowType)arg1); @@ -11957,7 +11462,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1viewport_1set_1shadow_1type) #ifndef NO__1gtk_1widget_1add_1accelerator JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1add_1accelerator) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jint arg5) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1accelerator_FUNC); @@ -11971,7 +11476,7 @@ fail: #ifndef NO__1gtk_1widget_1add_1controller JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1add_1controller) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1controller_FUNC); gtk_widget_add_controller((GtkWidget *)arg0, (GtkEventController *)arg1); @@ -11981,7 +11486,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1add_1controller) #ifndef NO__1gtk_1widget_1add_1events JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1add_1events) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1events_FUNC); /* @@ -11999,7 +11504,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1add_1events) #ifndef NO__1gtk_1widget_1child_1focus JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1child_1focus) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1child_1focus_FUNC); @@ -12010,18 +11515,18 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1child_1focus) #endif #ifndef NO__1gtk_1widget_1class_1get_1css_1name -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1class_1get_1css_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1class_1get_1css_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1class_1get_1css_1name_FUNC); /* - rc = (jintLong)gtk_widget_class_get_css_name((GtkWidgetClass *)arg0); + rc = (jlong)gtk_widget_class_get_css_name((GtkWidgetClass *)arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_widget_class_get_css_name) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidgetClass *))fp)((GtkWidgetClass *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkWidgetClass *))fp)((GtkWidgetClass *)arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1class_1get_1css_1name_FUNC); @@ -12029,59 +11534,37 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1class_1get_1css_1name) } #endif -#if (!defined(NO__1gtk_1widget_1create_1pango_1layout__II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO__1gtk_1widget_1create_1pango_1layout__JJ +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC); -#else + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC); -#endif - rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC); -#else + rc = (jlong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1gtk_1widget_1create_1pango_1layout__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__J_3B) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#else -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#endif +#ifndef NO__1gtk_1widget_1create_1pango_1layout__J_3B +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__J_3B) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC); -#else + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1); + rc = (jlong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC); -#endif return rc; } #endif #ifndef NO__1gtk_1widget_1destroy JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1destroy_FUNC); gtk_widget_destroy((GtkWidget *)arg0); @@ -12091,7 +11574,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1destroy) #ifndef NO__1gtk_1widget_1draw JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1draw) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1draw_FUNC); /* @@ -12109,7 +11592,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1draw) #ifndef NO__1gtk_1widget_1event JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1event) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1event_FUNC); @@ -12120,12 +11603,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1event) #endif #ifndef NO__1gtk_1widget_1get_1accessible -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1accessible) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1accessible) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1accessible_FUNC); - rc = (jintLong)gtk_widget_get_accessible((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_accessible((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1accessible_FUNC); return rc; } @@ -12133,7 +11616,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1accessible) #ifndef NO__1gtk_1widget_1get_1allocation JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1allocation) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GtkAllocation _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1allocation_FUNC); @@ -12147,7 +11630,7 @@ fail: #ifndef NO__1gtk_1widget_1get_1can_1default JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1can_1default) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1can_1default_FUNC); @@ -12159,7 +11642,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1can_1default) #ifndef NO__1gtk_1widget_1get_1child_1visible JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1child_1visible) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1child_1visible_FUNC); @@ -12171,7 +11654,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1child_1visible) #ifndef NO__1gtk_1widget_1get_1clip JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1clip) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GtkAllocation _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1clip_FUNC); @@ -12193,7 +11676,7 @@ fail: #ifndef NO__1gtk_1widget_1get_1events JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1events) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1events_FUNC); @@ -12212,12 +11695,12 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1events) #endif #ifndef NO__1gtk_1widget_1get_1first_1child -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1first_1child) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1first_1child) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1first_1child_FUNC); - rc = (jintLong)gtk_widget_get_first_child((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_first_child((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1first_1child_FUNC); return rc; } @@ -12225,7 +11708,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1first_1child) #ifndef NO__1gtk_1widget_1get_1has_1surface JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1has_1surface) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1has_1surface_FUNC); @@ -12237,7 +11720,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1has_1surface) #ifndef NO__1gtk_1widget_1get_1has_1window JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1has_1window) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1has_1window_FUNC); @@ -12249,7 +11732,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1has_1window) #ifndef NO__1gtk_1widget_1get_1mapped JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1mapped) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1mapped_FUNC); @@ -12261,7 +11744,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1mapped) #ifndef NO__1gtk_1widget_1get_1margin_1bottom JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1bottom) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1margin_1bottom_FUNC); @@ -12281,7 +11764,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1bottom) #ifndef NO__1gtk_1widget_1get_1margin_1end JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1end) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1margin_1end_FUNC); @@ -12301,7 +11784,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1end) #ifndef NO__1gtk_1widget_1get_1margin_1start JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1start) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1margin_1start_FUNC); @@ -12321,7 +11804,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1start) #ifndef NO__1gtk_1widget_1get_1margin_1top JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1top) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1margin_1top_FUNC); @@ -12340,13 +11823,13 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1margin_1top) #endif #ifndef NO__1gtk_1widget_1get_1name -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1name_FUNC); - rc = (jintLong)gtk_widget_get_name((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_name((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1name_FUNC); return rc; } #endif @@ -12365,7 +11848,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1next_1sibling) #ifndef NO__1gtk_1widget_1get_1opacity JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1widget_1get_1opacity) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1opacity_FUNC); @@ -12384,42 +11867,42 @@ JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1widget_1get_1opacity) #endif #ifndef NO__1gtk_1widget_1get_1pango_1context -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1pango_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1pango_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1pango_1context_FUNC); - rc = (jintLong)gtk_widget_get_pango_context((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_pango_context((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1pango_1context_FUNC); return rc; } #endif #ifndef NO__1gtk_1widget_1get_1parent -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_FUNC); - rc = (jintLong)gtk_widget_get_parent((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_parent((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_FUNC); return rc; } #endif #ifndef NO__1gtk_1widget_1get_1parent_1surface -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent_1surface) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent_1surface) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_1surface_FUNC); /* - rc = (jintLong)gtk_widget_get_parent_surface((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_parent_surface((GtkWidget *)arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_widget_get_parent_surface) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_1surface_FUNC); @@ -12428,18 +11911,18 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent_1surface) #endif #ifndef NO__1gtk_1widget_1get_1parent_1window -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent_1window) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent_1window) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_1window_FUNC); /* - rc = (jintLong)gtk_widget_get_parent_window((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_parent_window((GtkWidget *)arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_widget_get_parent_window) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_1window_FUNC); @@ -12449,7 +11932,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent_1window) #ifndef NO__1gtk_1widget_1get_1preferred_1height JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1preferred_1height) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -12474,7 +11957,7 @@ fail: #ifndef NO__1gtk_1widget_1get_1preferred_1height_1for_1width JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1preferred_1height_1for_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jintArray arg3) { jint *lparg2=NULL; jint *lparg3=NULL; @@ -12499,7 +11982,7 @@ fail: #ifndef NO__1gtk_1widget_1get_1preferred_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1preferred_1size) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jobject arg2) { GtkRequisition _arg1, *lparg1=NULL; GtkRequisition _arg2, *lparg2=NULL; @@ -12516,7 +11999,7 @@ fail: #ifndef NO__1gtk_1widget_1get_1preferred_1width_1for_1height JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1preferred_1width_1for_1height) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jintArray arg3) { jint *lparg2=NULL; jint *lparg3=NULL; @@ -12541,7 +12024,7 @@ fail: #ifndef NO__1gtk_1widget_1get_1realized JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1realized) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1realized_FUNC); @@ -12552,12 +12035,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1realized) #endif #ifndef NO__1gtk_1widget_1get_1screen -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1screen) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1screen) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1screen_FUNC); - rc = (jintLong)gtk_widget_get_screen((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_screen((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1screen_FUNC); return rc; } @@ -12565,7 +12048,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1screen) #ifndef NO__1gtk_1widget_1get_1sensitive JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1sensitive) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1sensitive_FUNC); @@ -12577,7 +12060,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1sensitive) #ifndef NO__1gtk_1widget_1get_1size_1request JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1size_1request) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -12594,7 +12077,7 @@ fail: #ifndef NO__1gtk_1widget_1get_1state_1flags JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1state_1flags) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1state_1flags_FUNC); @@ -12605,30 +12088,30 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1state_1flags) #endif #ifndef NO__1gtk_1widget_1get_1style_1context -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1style_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1style_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_1context_FUNC); - rc = (jintLong)gtk_widget_get_style_context((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_style_context((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_1context_FUNC); return rc; } #endif #ifndef NO__1gtk_1widget_1get_1surface -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1surface) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1surface) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1surface_FUNC); /* - rc = (jintLong)gtk_widget_get_surface((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_surface((GtkWidget *)arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_widget_get_surface) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1surface_FUNC); @@ -12637,24 +12120,24 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1surface) #endif #ifndef NO__1gtk_1widget_1get_1tooltip_1text -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1tooltip_1text) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1tooltip_1text) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1tooltip_1text_FUNC); - rc = (jintLong)gtk_widget_get_tooltip_text((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_tooltip_text((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1tooltip_1text_FUNC); return rc; } #endif #ifndef NO__1gtk_1widget_1get_1toplevel -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1toplevel) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1toplevel) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1toplevel_FUNC); - rc = (jintLong)gtk_widget_get_toplevel((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_toplevel((GtkWidget *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1toplevel_FUNC); return rc; } @@ -12662,7 +12145,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1toplevel) #ifndef NO__1gtk_1widget_1get_1visible JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1visible) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1visible_FUNC); @@ -12673,18 +12156,18 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1visible) #endif #ifndef NO__1gtk_1widget_1get_1window -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1window) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1window) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1window_FUNC); /* - rc = (jintLong)gtk_widget_get_window((GtkWidget *)arg0); + rc = (jlong)gtk_widget_get_window((GtkWidget *)arg0); */ { GTK_LOAD_FUNCTION(fp, gtk_widget_get_window) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); } } GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1window_FUNC); @@ -12694,7 +12177,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1window) #ifndef NO__1gtk_1widget_1grab_1focus JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1grab_1focus) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1grab_1focus_FUNC); gtk_widget_grab_focus((GtkWidget *)arg0); @@ -12704,7 +12187,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1grab_1focus) #ifndef NO__1gtk_1widget_1has_1default JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1has_1default) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1has_1default_FUNC); @@ -12716,7 +12199,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1has_1default) #ifndef NO__1gtk_1widget_1has_1focus JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1has_1focus) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1has_1focus_FUNC); @@ -12728,7 +12211,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1has_1focus) #ifndef NO__1gtk_1widget_1hide JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1hide) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1hide_FUNC); gtk_widget_hide((GtkWidget *)arg0); @@ -12738,7 +12221,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1hide) #ifndef NO__1gtk_1widget_1input_1shape_1combine_1region JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1input_1shape_1combine_1region) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1input_1shape_1combine_1region_FUNC); gtk_widget_input_shape_combine_region((GtkWidget *)arg0, (cairo_region_t *)arg1); @@ -12748,7 +12231,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1input_1shape_1combine_1region) #ifndef NO__1gtk_1widget_1is_1focus JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1is_1focus) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1focus_FUNC); @@ -12760,7 +12243,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1is_1focus) #ifndef NO__1gtk_1widget_1map JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1map) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1map_FUNC); gtk_widget_map((GtkWidget *)arg0); @@ -12770,7 +12253,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1map) #ifndef NO__1gtk_1widget_1measure JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1measure) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6) { jint *lparg3=NULL; jint *lparg4=NULL; @@ -12793,7 +12276,7 @@ fail: #ifndef NO__1gtk_1widget_1mnemonic_1activate JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1mnemonic_1activate) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC); @@ -12805,7 +12288,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1mnemonic_1activate) #ifndef NO__1gtk_1widget_1override_1background_1color JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1background_1color) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GdkRGBA _arg2, *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1background_1color_FUNC); @@ -12816,7 +12299,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1background_1color) { GTK_LOAD_FUNCTION(fp, gtk_widget_override_background_color) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2); } } fail: @@ -12827,7 +12310,7 @@ fail: #ifndef NO__1gtk_1widget_1override_1color JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1color) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { GdkRGBA _arg2, *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1color_FUNC); @@ -12838,7 +12321,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1color) { GTK_LOAD_FUNCTION(fp, gtk_widget_override_color) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2); } } fail: @@ -12849,7 +12332,7 @@ fail: #ifndef NO__1gtk_1widget_1override_1font JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1font) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1font_FUNC); /* @@ -12858,7 +12341,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1font) { GTK_LOAD_FUNCTION(fp, gtk_widget_override_font) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1override_1font_FUNC); @@ -12867,7 +12350,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1font) #ifndef NO__1gtk_1widget_1queue_1draw JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1queue_1draw) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1draw_FUNC); gtk_widget_queue_draw((GtkWidget *)arg0); @@ -12877,7 +12360,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1queue_1draw) #ifndef NO__1gtk_1widget_1queue_1resize JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1queue_1resize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1resize_FUNC); gtk_widget_queue_resize((GtkWidget *)arg0); @@ -12887,7 +12370,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1queue_1resize) #ifndef NO__1gtk_1widget_1realize JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1realize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1realize_FUNC); gtk_widget_realize((GtkWidget *)arg0); @@ -12897,7 +12380,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1realize) #ifndef NO__1gtk_1widget_1remove_1accelerator JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1remove_1accelerator) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1remove_1accelerator_FUNC); gtk_widget_remove_accelerator((GtkWidget *)arg0, (GtkAccelGroup *)arg1, (guint)arg2, (GdkModifierType)arg3); @@ -12907,7 +12390,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1remove_1accelerator) #ifndef NO__1gtk_1widget_1reparent JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1reparent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1reparent_FUNC); /* @@ -12925,7 +12408,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1reparent) #ifndef NO__1gtk_1widget_1set_1allocation JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1allocation) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GtkAllocation _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1allocation_FUNC); @@ -12946,7 +12429,7 @@ fail: #ifndef NO__1gtk_1widget_1set_1can_1default JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1can_1default) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1default_FUNC); gtk_widget_set_can_default((GtkWidget *)arg0, (gboolean)arg1); @@ -12956,7 +12439,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1can_1default) #ifndef NO__1gtk_1widget_1set_1can_1focus JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1can_1focus) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1focus_FUNC); gtk_widget_set_can_focus((GtkWidget *)arg0, (gboolean)arg1); @@ -12966,7 +12449,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1can_1focus) #ifndef NO__1gtk_1widget_1set_1clip JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1clip) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GtkAllocation _arg1, *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1clip_FUNC); @@ -12998,7 +12481,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1default_1direction) #ifndef NO__1gtk_1widget_1set_1direction JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1direction) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1direction_FUNC); gtk_widget_set_direction((GtkWidget *)arg0, (GtkTextDirection)arg1); @@ -13008,7 +12491,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1direction) #ifndef NO__1gtk_1widget_1set_1double_1buffered JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1double_1buffered) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC); /* @@ -13026,7 +12509,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1double_1buffered) #ifndef NO__1gtk_1widget_1set_1focus_1on_1click JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1focus_1on_1click) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1focus_1on_1click_FUNC); /* @@ -13044,7 +12527,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1focus_1on_1click) #ifndef NO__1gtk_1widget_1set_1halign JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1halign) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1halign_FUNC); gtk_widget_set_halign((GtkWidget *)arg0, (GtkAlign)arg1); @@ -13054,7 +12537,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1halign) #ifndef NO__1gtk_1widget_1set_1has_1surface JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1has_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1has_1surface_FUNC); gtk_widget_set_has_surface((GtkWidget *)arg0, (gboolean)arg1); @@ -13064,7 +12547,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1has_1surface) #ifndef NO__1gtk_1widget_1set_1has_1window JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1has_1window) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1has_1window_FUNC); gtk_widget_set_has_window((GtkWidget *)arg0, (gboolean)arg1); @@ -13074,7 +12557,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1has_1window) #ifndef NO__1gtk_1widget_1set_1hexpand JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1hexpand) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1hexpand_FUNC); gtk_widget_set_hexpand((GtkWidget *)arg0, (gboolean)arg1); @@ -13084,7 +12567,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1hexpand) #ifndef NO__1gtk_1widget_1set_1margin_1bottom JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1bottom) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1margin_1bottom_FUNC); /* @@ -13102,7 +12585,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1bottom) #ifndef NO__1gtk_1widget_1set_1margin_1end JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1end) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1margin_1end_FUNC); /* @@ -13120,7 +12603,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1end) #ifndef NO__1gtk_1widget_1set_1margin_1start JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1start) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1margin_1start_FUNC); /* @@ -13138,7 +12621,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1start) #ifndef NO__1gtk_1widget_1set_1margin_1top JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1top) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1margin_1top_FUNC); /* @@ -13156,7 +12639,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1margin_1top) #ifndef NO__1gtk_1widget_1set_1name JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1name) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1name_FUNC); @@ -13170,7 +12653,7 @@ fail: #ifndef NO__1gtk_1widget_1set_1opacity JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1opacity) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1opacity_FUNC); /* @@ -13188,7 +12671,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1opacity) #ifndef NO__1gtk_1widget_1set_1parent_1surface JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1parent_1surface) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1parent_1surface_FUNC); gtk_widget_set_parent_surface((GtkWidget *)arg0, (GdkSurface *)arg1); @@ -13198,7 +12681,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1parent_1surface) #ifndef NO__1gtk_1widget_1set_1parent_1window JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1parent_1window) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1parent_1window_FUNC); gtk_widget_set_parent_window((GtkWidget *)arg0, (GdkWindow *)arg1); @@ -13208,7 +12691,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1parent_1window) #ifndef NO__1gtk_1widget_1set_1receives_1default JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1receives_1default) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1receives_1default_FUNC); gtk_widget_set_receives_default((GtkWidget *)arg0, (gboolean)arg1); @@ -13218,7 +12701,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1receives_1default) #ifndef NO__1gtk_1widget_1set_1redraw_1on_1allocate JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC); /* @@ -13236,7 +12719,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate) #ifndef NO__1gtk_1widget_1set_1sensitive JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1sensitive) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1sensitive_FUNC); gtk_widget_set_sensitive((GtkWidget *)arg0, (gboolean)arg1); @@ -13246,7 +12729,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1sensitive) #ifndef NO__1gtk_1widget_1set_1size_1request JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1size_1request) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1size_1request_FUNC); gtk_widget_set_size_request((GtkWidget *)arg0, (gint)arg1, (gint)arg2); @@ -13256,7 +12739,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1size_1request) #ifndef NO__1gtk_1widget_1set_1tooltip_1text JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1tooltip_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC); @@ -13270,7 +12753,7 @@ fail: #ifndef NO__1gtk_1widget_1set_1valign JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1valign) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1valign_FUNC); gtk_widget_set_valign((GtkWidget *)arg0, (GtkAlign)arg1); @@ -13280,7 +12763,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1valign) #ifndef NO__1gtk_1widget_1set_1vexpand JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1vexpand) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1vexpand_FUNC); gtk_widget_set_vexpand((GtkWidget *)arg0, (gboolean)arg1); @@ -13290,7 +12773,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1vexpand) #ifndef NO__1gtk_1widget_1set_1visible JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1visible) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1visible_FUNC); gtk_widget_set_visible((GtkWidget *)arg0, (gboolean)arg1); @@ -13300,7 +12783,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1visible) #ifndef NO__1gtk_1widget_1shape_1combine_1region JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1shape_1combine_1region) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1shape_1combine_1region_FUNC); /* @@ -13318,7 +12801,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1shape_1combine_1region) #ifndef NO__1gtk_1widget_1show JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1show) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1show_FUNC); gtk_widget_show((GtkWidget *)arg0); @@ -13326,19 +12809,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1show) } #endif -#if (!defined(NO__1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO__1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2 +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GtkAllocation _arg1, *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2_FUNC); -#endif if (arg1) if ((lparg1 = getGtkAllocationFields(env, arg1, &_arg1)) == NULL) goto fail; /* gtk_widget_size_allocate((GtkWidget *)arg0, (GtkAllocation *)lparg1); @@ -13350,27 +12826,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__JLorg_eclipse_s } } fail: -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO__1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { GtkAllocation _arg1, *lparg1=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2I_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I_FUNC); -#endif if (arg1) if ((lparg1 = getGtkAllocationFields(env, arg1, &_arg1)) == NULL) goto fail; /* gtk_widget_size_allocate((GtkWidget *)arg0, (GtkAllocation *)lparg1, arg2); @@ -13382,17 +12847,13 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate__JLorg_eclipse_s } } fail: -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2I_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I_FUNC); -#endif } #endif #ifndef NO__1gtk_1widget_1snapshot_1child JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1snapshot_1child) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1snapshot_1child_FUNC); gtk_widget_snapshot_child((GtkWidget *)arg0, (GtkWidget *)arg1, (GtkSnapshot *)arg2); @@ -13400,65 +12861,43 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1snapshot_1child) } #endif -#if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3IJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3) -#endif +#ifndef NO__1gtk_1widget_1style_1get__J_3B_3IJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintArray arg2, jlong arg3) { jbyte *lparg1=NULL; jint *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC); -#endif } #endif -#if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3) -#endif +#ifndef NO__1gtk_1widget_1style_1get__J_3B_3JJ +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlongArray arg2, jlong arg3) { jbyte *lparg1=NULL; jlong *lparg2=NULL; -#ifndef JNI64 - GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC); -#else GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); fail: if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC); -#else GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC); -#endif } #endif #ifndef NO__1gtk_1widget_1translate_1coordinates JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1translate_1coordinates) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5) { jint *lparg4=NULL; jint *lparg5=NULL; @@ -13477,7 +12916,7 @@ fail: #ifndef NO__1gtk_1window_1activate_1default JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1activate_1default) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1activate_1default_FUNC); @@ -13489,7 +12928,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1activate_1default) #ifndef NO__1gtk_1window_1add_1accel_1group JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1add_1accel_1group) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1add_1accel_1group_FUNC); gtk_window_add_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1); @@ -13499,7 +12938,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1add_1accel_1group) #ifndef NO__1gtk_1window_1deiconify JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1deiconify) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1deiconify_FUNC); gtk_window_deiconify((GtkWindow *)arg0); @@ -13509,7 +12948,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1deiconify) #ifndef NO__1gtk_1window_1fullscreen JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1fullscreen) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1fullscreen_FUNC); gtk_window_fullscreen((GtkWindow *)arg0); @@ -13518,36 +12957,36 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1fullscreen) #endif #ifndef NO__1gtk_1window_1get_1focus -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1get_1focus) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1window_1get_1focus) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1focus_FUNC); - rc = (jintLong)gtk_window_get_focus((GtkWindow *)arg0); + rc = (jlong)gtk_window_get_focus((GtkWindow *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1focus_FUNC); return rc; } #endif #ifndef NO__1gtk_1window_1get_1group -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1get_1group) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1window_1get_1group) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1group_FUNC); - rc = (jintLong)gtk_window_get_group((GtkWindow *)arg0); + rc = (jlong)gtk_window_get_group((GtkWindow *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1group_FUNC); return rc; } #endif #ifndef NO__1gtk_1window_1get_1icon_1list -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1get_1icon_1list) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1window_1get_1icon_1list) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1icon_1list_FUNC); - rc = (jintLong)gtk_window_get_icon_list((GtkWindow *)arg0); + rc = (jlong)gtk_window_get_icon_list((GtkWindow *)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1icon_1list_FUNC); return rc; } @@ -13555,7 +12994,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1get_1icon_1list) #ifndef NO__1gtk_1window_1get_1mnemonic_1modifier JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC); @@ -13567,7 +13006,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier) #ifndef NO__1gtk_1window_1get_1modal JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1get_1modal) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1modal_FUNC); @@ -13579,7 +13018,7 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1get_1modal) #ifndef NO__1gtk_1window_1get_1position JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1get_1position) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -13596,7 +13035,7 @@ fail: #ifndef NO__1gtk_1window_1get_1size JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1get_1size) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -13613,7 +13052,7 @@ fail: #ifndef NO__1gtk_1window_1group_1add_1window JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1group_1add_1window) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1group_1add_1window_FUNC); gtk_window_group_add_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1); @@ -13622,12 +13061,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1group_1add_1window) #endif #ifndef NO__1gtk_1window_1group_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1group_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1window_1group_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1group_1new_FUNC); - rc = (jintLong)gtk_window_group_new(); + rc = (jlong)gtk_window_group_new(); GTK_NATIVE_EXIT(env, that, _1gtk_1window_1group_1new_FUNC); return rc; } @@ -13635,7 +13074,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1group_1new) #ifndef NO__1gtk_1window_1group_1remove_1window JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1group_1remove_1window) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1group_1remove_1window_FUNC); gtk_window_group_remove_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1); @@ -13645,7 +13084,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1group_1remove_1window) #ifndef NO__1gtk_1window_1iconify JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1iconify) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1iconify_FUNC); gtk_window_iconify((GtkWindow *)arg0); @@ -13655,7 +13094,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1iconify) #ifndef NO__1gtk_1window_1is_1active JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1is_1active) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1is_1active_FUNC); @@ -13666,12 +13105,12 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1is_1active) #endif #ifndef NO__1gtk_1window_1list_1toplevels -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1list_1toplevels) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1window_1list_1toplevels) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1list_1toplevels_FUNC); - rc = (jintLong)gtk_window_list_toplevels(); + rc = (jlong)gtk_window_list_toplevels(); GTK_NATIVE_EXIT(env, that, _1gtk_1window_1list_1toplevels_FUNC); return rc; } @@ -13679,7 +13118,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1list_1toplevels) #ifndef NO__1gtk_1window_1maximize JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1maximize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1maximize_FUNC); gtk_window_maximize((GtkWindow *)arg0); @@ -13689,7 +13128,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1maximize) #ifndef NO__1gtk_1window_1move JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1move) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1move_FUNC); gtk_window_move((GtkWindow *)arg0, (gint)arg1, (gint)arg2); @@ -13698,12 +13137,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1move) #endif #ifndef NO__1gtk_1window_1new -JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1new) +JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1window_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1new_FUNC); - rc = (jintLong)gtk_window_new((GtkWindowType)arg0); + rc = (jlong)gtk_window_new((GtkWindowType)arg0); GTK_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC); return rc; } @@ -13711,7 +13150,7 @@ JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1new) #ifndef NO__1gtk_1window_1remove_1accel_1group JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1remove_1accel_1group) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1remove_1accel_1group_FUNC); gtk_window_remove_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1); @@ -13721,7 +13160,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1remove_1accel_1group) #ifndef NO__1gtk_1window_1resize JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1resize) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1resize_FUNC); gtk_window_resize((GtkWindow *)arg0, (gint)arg1, (gint)arg2); @@ -13731,7 +13170,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1resize) #ifndef NO__1gtk_1window_1set_1attached_1to JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1attached_1to) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1attached_1to_FUNC); gtk_window_set_attached_to((GtkWindow *)arg0, (GtkWidget *)arg1); @@ -13741,7 +13180,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1attached_1to) #ifndef NO__1gtk_1window_1set_1decorated JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1decorated) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1decorated_FUNC); gtk_window_set_decorated((GtkWindow *)arg0, (gboolean)arg1); @@ -13751,7 +13190,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1decorated) #ifndef NO__1gtk_1window_1set_1default JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1default) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1default_FUNC); gtk_window_set_default((GtkWindow *)arg0, (GtkWidget *)arg1); @@ -13761,7 +13200,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1default) #ifndef NO__1gtk_1window_1set_1destroy_1with_1parent JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC); gtk_window_set_destroy_with_parent((GtkWindow *)arg0, (gboolean)arg1); @@ -13771,7 +13210,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent) #ifndef NO__1gtk_1window_1set_1geometry_1hints JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1geometry_1hints) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jint arg3) { GdkGeometry _arg2, *lparg2=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC); @@ -13784,7 +13223,7 @@ fail: #ifndef NO__1gtk_1window_1set_1icon_1list JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1icon_1list) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1icon_1list_FUNC); gtk_window_set_icon_list((GtkWindow *)arg0, (GList *)arg1); @@ -13794,7 +13233,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1icon_1list) #ifndef NO__1gtk_1window_1set_1keep_1above JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1keep_1above) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1keep_1above_FUNC); gtk_window_set_keep_above((GtkWindow *)arg0, (gboolean)arg1); @@ -13804,7 +13243,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1keep_1above) #ifndef NO__1gtk_1window_1set_1modal JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1modal) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1modal_FUNC); gtk_window_set_modal((GtkWindow *)arg0, (gboolean)arg1); @@ -13814,7 +13253,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1modal) #ifndef NO__1gtk_1window_1set_1resizable JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1resizable) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1resizable_FUNC); gtk_window_set_resizable((GtkWindow *)arg0, (gboolean)arg1); @@ -13824,7 +13263,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1resizable) #ifndef NO__1gtk_1window_1set_1skip_1taskbar_1hint JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC); gtk_window_set_skip_taskbar_hint((GtkWindow *)arg0, (gboolean)arg1); @@ -13834,7 +13273,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint) #ifndef NO__1gtk_1window_1set_1title JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1title) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1title_FUNC); @@ -13848,7 +13287,7 @@ fail: #ifndef NO__1gtk_1window_1set_1transient_1for JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1transient_1for) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1transient_1for_FUNC); gtk_window_set_transient_for((GtkWindow *)arg0, (GtkWindow *)arg1); @@ -13858,7 +13297,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1transient_1for) #ifndef NO__1gtk_1window_1set_1type_1hint JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1type_1hint) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1type_1hint_FUNC); gtk_window_set_type_hint((GtkWindow *)arg0, arg1); @@ -13868,7 +13307,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1type_1hint) #ifndef NO__1gtk_1window_1unfullscreen JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1unfullscreen) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1unfullscreen_FUNC); gtk_window_unfullscreen((GtkWindow *)arg0); @@ -13878,7 +13317,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1unfullscreen) #ifndef NO__1gtk_1window_1unmaximize JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1unmaximize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { GTK_NATIVE_ENTER(env, that, _1gtk_1window_1unmaximize_FUNC); gtk_window_unmaximize((GtkWindow *)arg0); @@ -13891,12 +13330,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1unmaximize) #endif #ifndef NO__1graphene_1rect_1alloc -JNIEXPORT jintLong JNICALL Graphene_NATIVE(_1graphene_1rect_1alloc) +JNIEXPORT jlong JNICALL Graphene_NATIVE(_1graphene_1rect_1alloc) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Graphene_NATIVE_ENTER(env, that, _1graphene_1rect_1alloc_FUNC); - rc = (jintLong)graphene_rect_alloc(); + rc = (jlong)graphene_rect_alloc(); Graphene_NATIVE_EXIT(env, that, _1graphene_1rect_1alloc_FUNC); return rc; } @@ -13904,7 +13343,7 @@ JNIEXPORT jintLong JNICALL Graphene_NATIVE(_1graphene_1rect_1alloc) #ifndef NO__1graphene_1rect_1free JNIEXPORT void JNICALL Graphene_NATIVE(_1graphene_1rect_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Graphene_NATIVE_ENTER(env, that, _1graphene_1rect_1free_FUNC); graphene_rect_free((graphene_rect_t *)arg0); @@ -13913,12 +13352,12 @@ JNIEXPORT void JNICALL Graphene_NATIVE(_1graphene_1rect_1free) #endif #ifndef NO__1graphene_1rect_1init -JNIEXPORT jintLong JNICALL Graphene_NATIVE(_1graphene_1rect_1init) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4) +JNIEXPORT jlong JNICALL Graphene_NATIVE(_1graphene_1rect_1init) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4) { - jintLong rc = 0; + jlong rc = 0; Graphene_NATIVE_ENTER(env, that, _1graphene_1rect_1init_FUNC); - rc = (jintLong)graphene_rect_init((graphene_rect_t *)arg0, arg1, arg2, arg3, arg4); + rc = (jlong)graphene_rect_init((graphene_rect_t *)arg0, arg1, arg2, arg3, arg4); Graphene_NATIVE_EXIT(env, that, _1graphene_1rect_1init_FUNC); return rc; } @@ -13928,48 +13367,26 @@ JNIEXPORT jintLong JNICALL Graphene_NATIVE(_1graphene_1rect_1init) #define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func #endif -#if (!defined(NO_Call__IIII) && !defined(JNI64)) || (!defined(NO_Call__JJII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(Call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(Call__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) -#endif +#ifndef NO_Call__JJII +JNIEXPORT jint JNICALL OS_NATIVE(Call__JJII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, Call__IIII_FUNC); -#else OS_NATIVE_ENTER(env, that, Call__JJII_FUNC); -#endif rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, Call__IIII_FUNC); -#else OS_NATIVE_EXIT(env, that, Call__JJII_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Call__IIIJ) && !defined(JNI64)) || (!defined(NO_Call__JJIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jlong JNICALL OS_NATIVE(Call__IIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3) -#else -JNIEXPORT jlong JNICALL OS_NATIVE(Call__JJIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3) -#endif +#ifndef NO_Call__JJIJ +JNIEXPORT jlong JNICALL OS_NATIVE(Call__JJIJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3) { jlong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, Call__IIIJ_FUNC); -#else OS_NATIVE_ENTER(env, that, Call__JJIJ_FUNC); -#endif rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, Call__IIIJ_FUNC); -#else OS_NATIVE_EXIT(env, that, Call__JJIJ_FUNC); -#endif return rc; } #endif @@ -14023,12 +13440,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTypeQuery_1sizeof) #endif #ifndef NO_G_1OBJECT_1CLASS_1CONSTRUCTOR -JNIEXPORT jintLong JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1CONSTRUCTOR) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1CONSTRUCTOR) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC); - rc = (jintLong)G_OBJECT_CLASS_CONSTRUCTOR((GObjectClass *)arg0); + rc = (jlong)G_OBJECT_CLASS_CONSTRUCTOR((GObjectClass *)arg0); OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC); return rc; } @@ -14036,7 +13453,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1CONSTRUCTOR) #ifndef NO_G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR JNIEXPORT void JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC); G_OBJECT_CLASS_SET_CONSTRUCTOR((GObjectClass *)arg0, arg1); @@ -14045,72 +13462,72 @@ JNIEXPORT void JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR) #endif #ifndef NO_G_1TYPE_1BOOLEAN -JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1BOOLEAN) +JNIEXPORT jlong JNICALL OS_NATIVE(G_1TYPE_1BOOLEAN) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, G_1TYPE_1BOOLEAN_FUNC); - rc = (jintLong)G_TYPE_BOOLEAN; + rc = (jlong)G_TYPE_BOOLEAN; OS_NATIVE_EXIT(env, that, G_1TYPE_1BOOLEAN_FUNC); return rc; } #endif #ifndef NO_G_1TYPE_1DOUBLE -JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1DOUBLE) +JNIEXPORT jlong JNICALL OS_NATIVE(G_1TYPE_1DOUBLE) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, G_1TYPE_1DOUBLE_FUNC); - rc = (jintLong)G_TYPE_DOUBLE; + rc = (jlong)G_TYPE_DOUBLE; OS_NATIVE_EXIT(env, that, G_1TYPE_1DOUBLE_FUNC); return rc; } #endif #ifndef NO_G_1TYPE_1FLOAT -JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1FLOAT) +JNIEXPORT jlong JNICALL OS_NATIVE(G_1TYPE_1FLOAT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, G_1TYPE_1FLOAT_FUNC); - rc = (jintLong)G_TYPE_FLOAT; + rc = (jlong)G_TYPE_FLOAT; OS_NATIVE_EXIT(env, that, G_1TYPE_1FLOAT_FUNC); return rc; } #endif #ifndef NO_G_1TYPE_1INT -JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT) +JNIEXPORT jlong JNICALL OS_NATIVE(G_1TYPE_1INT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, G_1TYPE_1INT_FUNC); - rc = (jintLong)G_TYPE_INT; + rc = (jlong)G_TYPE_INT; OS_NATIVE_EXIT(env, that, G_1TYPE_1INT_FUNC); return rc; } #endif #ifndef NO_G_1TYPE_1INT64 -JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT64) +JNIEXPORT jlong JNICALL OS_NATIVE(G_1TYPE_1INT64) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, G_1TYPE_1INT64_FUNC); - rc = (jintLong)G_TYPE_INT64; + rc = (jlong)G_TYPE_INT64; OS_NATIVE_EXIT(env, that, G_1TYPE_1INT64_FUNC); return rc; } #endif #ifndef NO_G_1VALUE_1TYPE -JNIEXPORT jintLong JNICALL OS_NATIVE(G_1VALUE_1TYPE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(G_1VALUE_1TYPE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, G_1VALUE_1TYPE_FUNC); - rc = (jintLong)G_VALUE_TYPE(arg0); + rc = (jlong)G_VALUE_TYPE(arg0); OS_NATIVE_EXIT(env, that, G_1VALUE_1TYPE_FUNC); return rc; } @@ -14298,7 +13715,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(XFocusChangeEvent_1sizeof) #ifndef NO_X_1EVENT_1TYPE JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, X_1EVENT_1TYPE_FUNC); @@ -14309,12 +13726,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE) #endif #ifndef NO_X_1EVENT_1WINDOW -JNIEXPORT jintLong JNICALL OS_NATIVE(X_1EVENT_1WINDOW) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(X_1EVENT_1WINDOW) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, X_1EVENT_1WINDOW_FUNC); - rc = (jintLong)X_EVENT_WINDOW((XAnyEvent *)arg0); + rc = (jlong)X_EVENT_WINDOW((XAnyEvent *)arg0); OS_NATIVE_EXIT(env, that, X_1EVENT_1WINDOW_FUNC); return rc; } @@ -14322,7 +13739,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(X_1EVENT_1WINDOW) #ifndef NO__1Call JNIEXPORT jint JNICALL OS_NATIVE(_1Call) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1Call_FUNC); @@ -14334,7 +13751,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1Call) #ifndef NO__1FcConfigAppFontAddFile JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jboolean rc = 0; @@ -14346,7 +13763,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile) { OS_LOAD_FUNCTION(fp, FcConfigAppFontAddFile) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -14358,7 +13775,7 @@ fail: #ifndef NO__1GString_1len JNIEXPORT jint JNICALL OS_NATIVE(_1GString_1len) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1GString_1len_FUNC); @@ -14369,60 +13786,60 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GString_1len) #endif #ifndef NO__1GString_1str -JNIEXPORT jintLong JNICALL OS_NATIVE(_1GString_1str) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1GString_1str) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1GString_1str_FUNC); - rc = (jintLong)((GString *)arg0)->str; + rc = (jlong)((GString *)arg0)->str; OS_NATIVE_EXIT(env, that, _1GString_1str_FUNC); return rc; } #endif #ifndef NO__1G_1OBJECT_1CLASS -JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1CLASS_FUNC); - rc = (jintLong)G_OBJECT_CLASS(arg0); + rc = (jlong)G_OBJECT_CLASS(arg0); OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1CLASS_FUNC); return rc; } #endif #ifndef NO__1G_1OBJECT_1GET_1CLASS -JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC); - rc = (jintLong)G_OBJECT_GET_CLASS(arg0); + rc = (jlong)G_OBJECT_GET_CLASS(arg0); OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC); return rc; } #endif #ifndef NO__1G_1OBJECT_1TYPE -JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_FUNC); - rc = (jintLong)G_OBJECT_TYPE(arg0); + rc = (jlong)G_OBJECT_TYPE(arg0); OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_FUNC); return rc; } #endif #ifndef NO__1G_1OBJECT_1TYPE_1NAME -JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC); - rc = (jintLong)G_OBJECT_TYPE_NAME(arg0); + rc = (jlong)G_OBJECT_TYPE_NAME(arg0); OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC); return rc; } @@ -14430,7 +13847,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME) #ifndef NO__1G_1TYPE_1CHECK_1INSTANCE_1TYPE JNIEXPORT jboolean JNICALL OS_NATIVE(_1G_1TYPE_1CHECK_1INSTANCE_1TYPE) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC); @@ -14441,12 +13858,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1G_1TYPE_1CHECK_1INSTANCE_1TYPE) #endif #ifndef NO__1G_1TYPE_1STRING -JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING) +JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1TYPE_1STRING) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1G_1TYPE_1STRING_FUNC); - rc = (jintLong)G_TYPE_STRING; + rc = (jlong)G_TYPE_STRING; OS_NATIVE_EXIT(env, that, _1G_1TYPE_1STRING_FUNC); return rc; } @@ -14465,48 +13882,48 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1PIXELS) #endif #ifndef NO__1PANGO_1TYPE_1FONT_1DESCRIPTION -JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION) +JNIEXPORT jlong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC); - rc = (jintLong)PANGO_TYPE_FONT_DESCRIPTION; + rc = (jlong)PANGO_TYPE_FONT_DESCRIPTION; OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC); return rc; } #endif #ifndef NO__1PANGO_1TYPE_1FONT_1FACE -JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FACE) +JNIEXPORT jlong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FACE) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1FACE_FUNC); - rc = (jintLong)PANGO_TYPE_FONT_FACE; + rc = (jlong)PANGO_TYPE_FONT_FACE; OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1FACE_FUNC); return rc; } #endif #ifndef NO__1PANGO_1TYPE_1FONT_1FAMILY -JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FAMILY) +JNIEXPORT jlong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FAMILY) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1FAMILY_FUNC); - rc = (jintLong)PANGO_TYPE_FONT_FAMILY; + rc = (jlong)PANGO_TYPE_FONT_FAMILY; OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1FAMILY_FUNC); return rc; } #endif #ifndef NO__1PANGO_1TYPE_1LAYOUT -JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1LAYOUT) +JNIEXPORT jlong JNICALL OS_NATIVE(_1PANGO_1TYPE_1LAYOUT) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC); - rc = (jintLong)PANGO_TYPE_LAYOUT; + rc = (jlong)PANGO_TYPE_LAYOUT; OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC); return rc; } @@ -14514,7 +13931,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1LAYOUT) #ifndef NO__1XCheckIfEvent JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1XCheckIfEvent_FUNC); @@ -14525,12 +13942,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent) #endif #ifndef NO__1XDefaultRootWindow -JNIEXPORT jintLong JNICALL OS_NATIVE(_1XDefaultRootWindow) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1XDefaultRootWindow) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1XDefaultRootWindow_FUNC); - rc = (jintLong)XDefaultRootWindow((Display *)arg0); + rc = (jlong)XDefaultRootWindow((Display *)arg0); OS_NATIVE_EXIT(env, that, _1XDefaultRootWindow_FUNC); return rc; } @@ -14538,7 +13955,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XDefaultRootWindow) #ifndef NO__1XDefaultScreen JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1XDefaultScreen_FUNC); @@ -14550,7 +13967,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen) #ifndef NO__1XFree JNIEXPORT void JNICALL OS_NATIVE(_1XFree) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1XFree_FUNC); XFree((void *)arg0); @@ -14560,7 +13977,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XFree) #ifndef NO__1XQueryPointer JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8) { jintLong *lparg2=NULL; jintLong *lparg3=NULL; @@ -14593,24 +14010,24 @@ fail: #endif #ifndef NO__1XSetErrorHandler -JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetErrorHandler) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1XSetErrorHandler) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1XSetErrorHandler_FUNC); - rc = (jintLong)XSetErrorHandler((XErrorHandler)arg0); + rc = (jlong)XSetErrorHandler((XErrorHandler)arg0); OS_NATIVE_EXIT(env, that, _1XSetErrorHandler_FUNC); return rc; } #endif #ifndef NO__1XSetIOErrorHandler -JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetIOErrorHandler) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1XSetIOErrorHandler) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1XSetIOErrorHandler_FUNC); - rc = (jintLong)XSetIOErrorHandler((XIOErrorHandler)arg0); + rc = (jlong)XSetIOErrorHandler((XIOErrorHandler)arg0); OS_NATIVE_EXIT(env, that, _1XSetIOErrorHandler_FUNC); return rc; } @@ -14618,7 +14035,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetIOErrorHandler) #ifndef NO__1XSetInputFocus JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1XSetInputFocus_FUNC); @@ -14630,7 +14047,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus) #ifndef NO__1XSetTransientForHint JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1XSetTransientForHint_FUNC); @@ -14641,12 +14058,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint) #endif #ifndef NO__1XSynchronize -JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSynchronize) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1XSynchronize) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1XSynchronize_FUNC); - rc = (jintLong)XSynchronize((Display *)arg0, arg1); + rc = (jlong)XSynchronize((Display *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1XSynchronize_FUNC); return rc; } @@ -14668,84 +14085,51 @@ fail: } #endif -#if (!defined(NO__1call__IIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4) -#endif +#ifndef NO__1call__JJJJJ +JNIEXPORT jlong JNICALL OS_NATIVE(_1call__JJJJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4) { - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1call__IIIII_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1call__JJJJJ_FUNC); -#endif - rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1call__IIIII_FUNC); -#else + rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4); OS_NATIVE_EXIT(env, that, _1call__JJJJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1call__IIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6) -#endif +#ifndef NO__1call__JJJJJJJ +JNIEXPORT jlong JNICALL OS_NATIVE(_1call__JJJJJJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6) { - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1call__IIIIIII_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1call__JJJJJJJ_FUNC); -#endif - rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1call__IIIIIII_FUNC); -#else + rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6); OS_NATIVE_EXIT(env, that, _1call__JJJJJJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO__1call__IIIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7) -#endif +#ifndef NO__1call__JJJJJJJJ +JNIEXPORT jlong JNICALL OS_NATIVE(_1call__JJJJJJJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7) { - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1call__IIIIIIII_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1call__JJJJJJJJ_FUNC); -#endif - rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1call__IIIIIIII_FUNC); -#else + rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7); OS_NATIVE_EXIT(env, that, _1call__JJJJJJJJ_FUNC); -#endif return rc; } #endif #ifndef NO__1dlopen -JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlopen) +JNIEXPORT jlong JNICALL OS_NATIVE(_1dlopen) (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1dlopen_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)dlopen((const char *)lparg0, arg1); + rc = (jlong)dlopen((const char *)lparg0, arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1dlopen_FUNC); @@ -14754,16 +14138,16 @@ fail: #endif #ifndef NO__1g_1app_1info_1create_1from_1commandline -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline) - (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline) + (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jlong arg2, jlong arg3) { jbyte *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1create_1from_1commandline_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_app_info_create_from_commandline((gchar *)lparg0, (gchar *)lparg1, (GAppInfoCreateFlags)arg2, (GError **)arg3); + rc = (jlong)g_app_info_create_from_commandline((gchar *)lparg0, (gchar *)lparg1, (GAppInfoCreateFlags)arg2, (GError **)arg3); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); @@ -14773,26 +14157,26 @@ fail: #endif #ifndef NO__1g_1app_1info_1get_1all -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1all) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1app_1info_1get_1all) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1all_FUNC); - rc = (jintLong)g_app_info_get_all(); + rc = (jlong)g_app_info_get_all(); OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1all_FUNC); return rc; } #endif #ifndef NO__1g_1app_1info_1get_1default_1for_1type -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1default_1for_1type) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1app_1info_1get_1default_1for_1type) (JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_app_info_get_default_for_type((gchar *)lparg0, (gboolean)arg1); + rc = (jlong)g_app_info_get_default_for_type((gchar *)lparg0, (gboolean)arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC); @@ -14801,36 +14185,36 @@ fail: #endif #ifndef NO__1g_1app_1info_1get_1executable -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1executable) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1app_1info_1get_1executable) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1executable_FUNC); - rc = (jintLong)g_app_info_get_executable((GAppInfo *)arg0); + rc = (jlong)g_app_info_get_executable((GAppInfo *)arg0); OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1executable_FUNC); return rc; } #endif #ifndef NO__1g_1app_1info_1get_1icon -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1icon_FUNC); - rc = (jintLong)g_app_info_get_icon((GAppInfo *)arg0); + rc = (jlong)g_app_info_get_icon((GAppInfo *)arg0); OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1icon_FUNC); return rc; } #endif #ifndef NO__1g_1app_1info_1get_1name -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1name_FUNC); - rc = (jintLong)g_app_info_get_name((GAppInfo *)arg0); + rc = (jlong)g_app_info_get_name((GAppInfo *)arg0); OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1name_FUNC); return rc; } @@ -14838,7 +14222,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name) #ifndef NO__1g_1app_1info_1launch JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_FUNC); @@ -14850,7 +14234,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch) #ifndef NO__1g_1app_1info_1launch_1default_1for_1uri JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch_1default_1for_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_1default_1for_1uri_FUNC); @@ -14862,7 +14246,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch_1default_1for_1uri) #ifndef NO__1g_1app_1info_1should_1show JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1should_1show) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1should_1show_FUNC); @@ -14874,7 +14258,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1should_1show) #ifndef NO__1g_1app_1info_1supports_1uris JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1supports_1uris) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1app_1info_1supports_1uris_FUNC); @@ -14886,7 +14270,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1supports_1uris) #ifndef NO__1g_1bus_1own_1name JNIEXPORT jint JNICALL OS_NATIVE(_1g_1bus_1own_1name) - (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7) + (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7) { jbyte *lparg1=NULL; jint rc = 0; @@ -14901,14 +14285,14 @@ fail: #endif #ifndef NO__1g_1bytes_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1bytes_1new) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1bytes_1new) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1bytes_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_bytes_new((gconstpointer)lparg0, (gsize)arg1); + rc = (jlong)g_bytes_new((gconstpointer)lparg0, (gsize)arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1bytes_1new_FUNC); @@ -14918,7 +14302,7 @@ fail: #ifndef NO__1g_1bytes_1unref JNIEXPORT void JNICALL OS_NATIVE(_1g_1bytes_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1bytes_1unref_FUNC); g_bytes_unref((GBytes *)arg0); @@ -14927,24 +14311,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1bytes_1unref) #endif #ifndef NO__1g_1cclosure_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1cclosure_1new) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1cclosure_1new) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1cclosure_1new_FUNC); - rc = (jintLong)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2); + rc = (jlong)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2); OS_NATIVE_EXIT(env, that, _1g_1cclosure_1new_FUNC); return rc; } #endif #ifndef NO__1g_1closure_1ref -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1closure_1ref) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1closure_1ref) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1closure_1ref_FUNC); - rc = (jintLong)g_closure_ref((GClosure *)arg0); + rc = (jlong)g_closure_ref((GClosure *)arg0); OS_NATIVE_EXIT(env, that, _1g_1closure_1ref_FUNC); return rc; } @@ -14952,7 +14336,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1closure_1ref) #ifndef NO__1g_1closure_1sink JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1sink) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1closure_1sink_FUNC); g_closure_sink((GClosure *)arg0); @@ -14962,7 +14346,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1sink) #ifndef NO__1g_1closure_1unref JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1closure_1unref_FUNC); g_closure_unref((GClosure *)arg0); @@ -14972,7 +14356,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref) #ifndef NO__1g_1content_1type_1equals JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1equals) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jboolean rc = 0; @@ -14988,7 +14372,7 @@ fail: #ifndef NO__1g_1content_1type_1is_1a JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1is_1a) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jboolean rc = 0; @@ -15004,7 +14388,7 @@ fail: #ifndef NO__1g_1dbus_1connection_1register_1object JNIEXPORT jint JNICALL OS_NATIVE(_1g_1dbus_1connection_1register_1object) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLongArray arg3, jintLong arg4, jintLong arg5, jintLongArray arg6) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jintLongArray arg3, jlong arg4, jlong arg5, jintLongArray arg6) { jbyte *lparg1=NULL; jintLong *lparg3=NULL; @@ -15026,7 +14410,7 @@ fail: #ifndef NO__1g_1dbus_1method_1invocation_1return_1value JNIEXPORT void JNICALL OS_NATIVE(_1g_1dbus_1method_1invocation_1return_1value) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1g_1dbus_1method_1invocation_1return_1value_FUNC); g_dbus_method_invocation_return_value((GDBusMethodInvocation *)arg0, (GVariant *)arg1); @@ -15035,14 +14419,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1dbus_1method_1invocation_1return_1value) #endif #ifndef NO__1g_1dbus_1node_1info_1lookup_1interface -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1lookup_1interface) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1lookup_1interface) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1dbus_1node_1info_1lookup_1interface_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_dbus_node_info_lookup_interface((GDBusNodeInfo *)arg0, (const gchar *)lparg1); + rc = (jlong)g_dbus_node_info_lookup_interface((GDBusNodeInfo *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, _1g_1dbus_1node_1info_1lookup_1interface_FUNC); @@ -15051,16 +14435,16 @@ fail: #endif #ifndef NO__1g_1dbus_1node_1info_1new_1for_1xml -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1new_1for_1xml) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1new_1for_1xml) (JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1) { jbyte *lparg0=NULL; jintLong *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1dbus_1node_1info_1new_1for_1xml_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_dbus_node_info_new_for_xml((const gchar *)lparg0, (GError **)lparg1); + rc = (jlong)g_dbus_node_info_new_for_xml((const gchar *)lparg0, (GError **)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); @@ -15071,7 +14455,7 @@ fail: #ifndef NO__1g_1dbus_1proxy_1call JNIEXPORT void JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jint arg4, jintLong arg5, jintLong arg6, jintLongArray arg7) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jlong arg6, jintLongArray arg7) { jbyte *lparg1=NULL; jintLong *lparg7=NULL; @@ -15087,14 +14471,14 @@ fail: #endif #ifndef NO__1g_1dbus_1proxy_1call_1finish -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call_1finish) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call_1finish) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1dbus_1proxy_1call_1finish_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)g_dbus_proxy_call_finish((GDBusProxy *)arg0, (GAsyncResult *)arg1, (GError **)lparg2); + rc = (jlong)g_dbus_proxy_call_finish((GDBusProxy *)arg0, (GAsyncResult *)arg1, (GError **)lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); OS_NATIVE_EXIT(env, that, _1g_1dbus_1proxy_1call_1finish_FUNC); @@ -15103,16 +14487,16 @@ fail: #endif #ifndef NO__1g_1dbus_1proxy_1call_1sync -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call_1sync) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jint arg4, jintLong arg5, jintLongArray arg6) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call_1sync) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintLongArray arg6) { jbyte *lparg1=NULL; jintLong *lparg6=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1dbus_1proxy_1call_1sync_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jintLong)g_dbus_proxy_call_sync((GDBusProxy *)arg0, (const gchar *)lparg1, (GVariant *)arg2, arg3, arg4, (GCancellable *)arg5, (GError **)lparg6); + rc = (jlong)g_dbus_proxy_call_sync((GDBusProxy *)arg0, (const gchar *)lparg1, (GVariant *)arg2, arg3, arg4, (GCancellable *)arg5, (GError **)lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -15122,20 +14506,20 @@ fail: #endif #ifndef NO__1g_1dbus_1proxy_1new_1for_1bus_1sync -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1new_1for_1bus_1sync) - (JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jintLong arg6, jintLongArray arg7) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1new_1for_1bus_1sync) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jintLongArray arg7) { jbyte *lparg3=NULL; jbyte *lparg4=NULL; jbyte *lparg5=NULL; jintLong *lparg7=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1dbus_1proxy_1new_1for_1bus_1sync_FUNC); if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail; if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail; - rc = (jintLong)g_dbus_proxy_new_for_bus_sync(arg0, arg1, (GDBusInterfaceInfo *)arg2, (const gchar *)lparg3, (const gchar *)lparg4, (const gchar *)lparg5, (GCancellable *)arg6, (GError **)lparg7); + rc = (jlong)g_dbus_proxy_new_for_bus_sync(arg0, arg1, (GDBusInterfaceInfo *)arg2, (const gchar *)lparg3, (const gchar *)lparg4, (const gchar *)lparg5, (GCancellable *)arg6, (GError **)lparg7); fail: if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0); if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0); @@ -15148,7 +14532,7 @@ fail: #ifndef NO__1g_1error_1free JNIEXPORT void JNICALL OS_NATIVE(_1g_1error_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1error_1free_FUNC); g_error_free((GError *)arg0); @@ -15157,50 +14541,50 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1error_1free) #endif #ifndef NO__1g_1error_1get_1message -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1error_1get_1message) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1error_1get_1message) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1error_1get_1message_FUNC); - rc = (jintLong)g_error_get_message((GError *)arg0); + rc = (jlong)g_error_get_message((GError *)arg0); OS_NATIVE_EXIT(env, that, _1g_1error_1get_1message_FUNC); return rc; } #endif #ifndef NO__1g_1file_1get_1uri -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1file_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1file_1get_1uri_FUNC); - rc = (jintLong)g_file_get_uri((GFile *)arg0); + rc = (jlong)g_file_get_uri((GFile *)arg0); OS_NATIVE_EXIT(env, that, _1g_1file_1get_1uri_FUNC); return rc; } #endif #ifndef NO__1g_1file_1info_1get_1content_1type -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1file_1info_1get_1content_1type_FUNC); - rc = (jintLong)g_file_info_get_content_type((GFileInfo *)arg0); + rc = (jlong)g_file_info_get_content_type((GFileInfo *)arg0); OS_NATIVE_EXIT(env, that, _1g_1file_1info_1get_1content_1type_FUNC); return rc; } #endif #ifndef NO__1g_1file_1new_1for_1commandline_1arg -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_file_new_for_commandline_arg((const char *)lparg0); + rc = (jlong)g_file_new_for_commandline_arg((const char *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC); @@ -15209,14 +14593,14 @@ fail: #endif #ifndef NO__1g_1file_1new_1for_1path -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1path_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_file_new_for_path((const char *)lparg0); + rc = (jlong)g_file_new_for_path((const char *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1path_FUNC); @@ -15225,14 +14609,14 @@ fail: #endif #ifndef NO__1g_1file_1new_1for_1uri -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1uri) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1file_1new_1for_1uri) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1uri_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_file_new_for_uri((const char *)lparg0); + rc = (jlong)g_file_new_for_uri((const char *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1uri_FUNC); @@ -15241,14 +14625,14 @@ fail: #endif #ifndef NO__1g_1file_1query_1info -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1query_1info) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3, jintLong arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1file_1query_1info) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3, jlong arg4) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1file_1query_1info_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_file_query_info((GFile *)arg0, (const char *)lparg1, (GFileQueryInfoFlags)arg2, (GCancellable *)arg3, (GError **)arg4); + rc = (jlong)g_file_query_info((GFile *)arg0, (const char *)lparg1, (GFileQueryInfoFlags)arg2, (GCancellable *)arg3, (GError **)arg4); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, _1g_1file_1query_1info_FUNC); @@ -15273,28 +14657,28 @@ fail: #endif #ifndef NO__1g_1filename_1display_1name -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1display_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1display_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1filename_1display_1name_FUNC); - rc = (jintLong)g_filename_display_name((const gchar *)arg0); + rc = (jlong)g_filename_display_name((const gchar *)arg0); OS_NATIVE_EXIT(env, that, _1g_1filename_1display_1name_FUNC); return rc; } #endif #ifndef NO__1g_1filename_1from_1uri -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1from_1uri) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintLongArray arg2) { jintLong *lparg1=NULL; jintLong *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1uri_FUNC); if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2); + rc = (jlong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); @@ -15304,18 +14688,18 @@ fail: #endif #ifndef NO__1g_1filename_1from_1utf8 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) { jintLong *lparg2=NULL; jintLong *lparg3=NULL; jintLong *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1utf8_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4); + rc = (jlong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); @@ -15326,14 +14710,14 @@ fail: #endif #ifndef NO__1g_1filename_1to_1uri -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1to_1uri) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1uri_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2); + rc = (jlong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1uri_FUNC); @@ -15342,18 +14726,18 @@ fail: #endif #ifndef NO__1g_1filename_1to_1utf8 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) { jintLong *lparg2=NULL; jintLong *lparg3=NULL; jintLong *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1utf8_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4); + rc = (jlong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); @@ -15365,7 +14749,7 @@ fail: #ifndef NO__1g_1free JNIEXPORT void JNICALL OS_NATIVE(_1g_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1free_FUNC); g_free((gpointer)arg0); @@ -15374,30 +14758,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1free) #endif #ifndef NO__1g_1hash_1table_1get_1values -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1hash_1table_1get_1values) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1hash_1table_1get_1values) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1hash_1table_1get_1values_FUNC); - rc = (jintLong)g_hash_table_get_values((GHashTable *)arg0); + rc = (jlong)g_hash_table_get_values((GHashTable *)arg0); OS_NATIVE_EXIT(env, that, _1g_1hash_1table_1get_1values_FUNC); return rc; } #endif #ifndef NO__1g_1icon_1new_1for_1string -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1new_1for_1string) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1icon_1new_1for_1string) + (JNIEnv *env, jclass that, jbyteArray arg0, jlongArray arg1) { jbyte *lparg0=NULL; - jintLong *lparg1=NULL; - jintLong rc = 0; + jlong *lparg1=NULL; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1icon_1new_1for_1string_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_icon_new_for_string((const gchar *)lparg0, (GError **)lparg1); + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + rc = (jlong)g_icon_new_for_string((const gchar *)lparg0, (GError **)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1icon_1new_1for_1string_FUNC); return rc; @@ -15405,12 +14789,12 @@ fail: #endif #ifndef NO__1g_1icon_1to_1string -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1to_1string) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1icon_1to_1string) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1icon_1to_1string_FUNC); - rc = (jintLong)g_icon_to_string((GIcon *)arg0); + rc = (jlong)g_icon_to_string((GIcon *)arg0); OS_NATIVE_EXIT(env, that, _1g_1icon_1to_1string_FUNC); return rc; } @@ -15418,7 +14802,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1to_1string) #ifndef NO__1g_1idle_1add JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1idle_1add_FUNC); @@ -15429,24 +14813,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add) #endif #ifndef NO__1g_1list_1append -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1append) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1append) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC); - rc = (jintLong)g_list_append((GList *)arg0, (gpointer)arg1); + rc = (jlong)g_list_append((GList *)arg0, (gpointer)arg1); OS_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC); return rc; } #endif #ifndef NO__1g_1list_1data -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1data) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1data) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1data_FUNC); - rc = (jintLong)g_list_data((GList *)arg0); + rc = (jlong)g_list_data((GList *)arg0); OS_NATIVE_EXIT(env, that, _1g_1list_1data_FUNC); return rc; } @@ -15454,7 +14838,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1data) #ifndef NO__1g_1list_1free JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC); g_list_free((GList *)arg0); @@ -15464,7 +14848,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free) #ifndef NO__1g_1list_1free_11 JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1list_1free_11_FUNC); g_list_free_1((GList *)arg0); @@ -15473,12 +14857,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11) #endif #ifndef NO__1g_1list_1last -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1last) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1last) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1last_FUNC); - rc = (jintLong)g_list_last((GList *)arg0); + rc = (jlong)g_list_last((GList *)arg0); OS_NATIVE_EXIT(env, that, _1g_1list_1last_FUNC); return rc; } @@ -15486,7 +14870,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1last) #ifndef NO__1g_1list_1length JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1length_FUNC); @@ -15497,72 +14881,72 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length) #endif #ifndef NO__1g_1list_1next -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1next) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1next) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC); - rc = (jintLong)g_list_next(arg0); + rc = (jlong)g_list_next(arg0); OS_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC); return rc; } #endif #ifndef NO__1g_1list_1nth -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1nth) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1nth_FUNC); - rc = (jintLong)g_list_nth((GList *)arg0, (guint)arg1); + rc = (jlong)g_list_nth((GList *)arg0, (guint)arg1); OS_NATIVE_EXIT(env, that, _1g_1list_1nth_FUNC); return rc; } #endif #ifndef NO__1g_1list_1nth_1data -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth_1data) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1nth_1data) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1nth_1data_FUNC); - rc = (jintLong)g_list_nth_data((GList *)arg0, (guint)arg1); + rc = (jlong)g_list_nth_data((GList *)arg0, (guint)arg1); OS_NATIVE_EXIT(env, that, _1g_1list_1nth_1data_FUNC); return rc; } #endif #ifndef NO__1g_1list_1prepend -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1prepend) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1prepend) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1prepend_FUNC); - rc = (jintLong)g_list_prepend((GList *)arg0, (gpointer)arg1); + rc = (jlong)g_list_prepend((GList *)arg0, (gpointer)arg1); OS_NATIVE_EXIT(env, that, _1g_1list_1prepend_FUNC); return rc; } #endif #ifndef NO__1g_1list_1previous -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1previous) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1previous) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1previous_FUNC); - rc = (jintLong)g_list_previous(arg0); + rc = (jlong)g_list_previous(arg0); OS_NATIVE_EXIT(env, that, _1g_1list_1previous_FUNC); return rc; } #endif #ifndef NO__1g_1list_1remove_1link -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1remove_1link) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1remove_1link) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1list_1remove_1link_FUNC); - rc = (jintLong)g_list_remove_link((GList *)arg0, (GList *)arg1); + rc = (jlong)g_list_remove_link((GList *)arg0, (GList *)arg1); OS_NATIVE_EXIT(env, that, _1g_1list_1remove_1link_FUNC); return rc; } @@ -15570,7 +14954,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1remove_1link) #ifndef NO__1g_1list_1set_1next JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1g_1list_1set_1next_FUNC); g_list_set_next((GList *)arg0, (GList *)arg1); @@ -15580,7 +14964,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next) #ifndef NO__1g_1list_1set_1previous JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1g_1list_1set_1previous_FUNC); g_list_set_previous((GList *)arg0, (GList *)arg1); @@ -15590,7 +14974,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous) #ifndef NO__1g_1log_1default_1handler JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1default_1handler) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { OS_NATIVE_ENTER(env, that, _1g_1log_1default_1handler_FUNC); g_log_default_handler((gchar *)arg0, (GLogLevelFlags)arg1, (gchar *)arg2, (gpointer)arg3); @@ -15614,7 +14998,7 @@ fail: #ifndef NO__1g_1log_1set_1handler JNIEXPORT jint JNICALL OS_NATIVE(_1g_1log_1set_1handler) - (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jlong arg2, jlong arg3) { jbyte *lparg0=NULL; jint rc = 0; @@ -15630,7 +15014,7 @@ fail: #ifndef NO__1g_1main_1context_1acquire JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1main_1context_1acquire_FUNC); @@ -15642,7 +15026,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire) #ifndef NO__1g_1main_1context_1check JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1main_1context_1check_FUNC); @@ -15653,24 +15037,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check) #endif #ifndef NO__1g_1main_1context_1default -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1default) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1main_1context_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1main_1context_1default_FUNC); - rc = (jintLong)g_main_context_default(); + rc = (jlong)g_main_context_default(); OS_NATIVE_EXIT(env, that, _1g_1main_1context_1default_FUNC); return rc; } #endif #ifndef NO__1g_1main_1context_1get_1poll_1func -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1main_1context_1get_1poll_1func_FUNC); - rc = (jintLong)g_main_context_get_poll_func((GMainContext *)arg0); + rc = (jlong)g_main_context_get_poll_func((GMainContext *)arg0); OS_NATIVE_EXIT(env, that, _1g_1main_1context_1get_1poll_1func_FUNC); return rc; } @@ -15678,7 +15062,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func) #ifndef NO__1g_1main_1context_1iteration JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1main_1context_1iteration_FUNC); @@ -15690,7 +15074,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration) #ifndef NO__1g_1main_1context_1prepare JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1prepare) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jboolean rc = 0; @@ -15706,7 +15090,7 @@ fail: #ifndef NO__1g_1main_1context_1query JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1query) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintLong arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jlong arg3, jint arg4) { jint *lparg2=NULL; jint rc = 0; @@ -15722,7 +15106,7 @@ fail: #ifndef NO__1g_1main_1context_1release JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1main_1context_1release_FUNC); g_main_context_release((GMainContext *)arg0); @@ -15731,26 +15115,26 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release) #endif #ifndef NO__1g_1malloc -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1malloc) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1malloc) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1malloc_FUNC); - rc = (jintLong)g_malloc((gulong)arg0); + rc = (jlong)g_malloc((gulong)arg0); OS_NATIVE_EXIT(env, that, _1g_1malloc_FUNC); return rc; } #endif #ifndef NO__1g_1object_1class_1find_1property -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1class_1find_1property) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1class_1find_1property) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1object_1class_1find_1property_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_object_class_find_property((GObjectClass *)arg0, (const gchar *)lparg1); + rc = (jlong)g_object_class_find_property((GObjectClass *)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, _1g_1object_1class_1find_1property_FUNC); @@ -15758,81 +15142,59 @@ fail: } #endif -#if (!defined(NO__1g_1object_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1g_1object_1get__J_3B_3IJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1get__J_3B_3IJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3IJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintArray arg2, jlong arg3) { jbyte *lparg1=NULL; jint *lparg2=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1get__I_3B_3II_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1get__J_3B_3IJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1get__I_3B_3II_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1get__J_3B_3IJ_FUNC); -#endif } #endif -#if (!defined(NO__1g_1object_1get__I_3B_3JI) && !defined(JNI64)) || (!defined(NO__1g_1object_1get__J_3B_3JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1get__J_3B_3JJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3JJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlongArray arg2, jlong arg3) { jbyte *lparg1=NULL; jlong *lparg2=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1get__I_3B_3JI_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1get__J_3B_3JJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); fail: if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1get__I_3B_3JI_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1get__J_3B_3JJ_FUNC); -#endif } #endif #ifndef NO__1g_1object_1get_1qdata -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1get_1qdata) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1get_1qdata) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1object_1get_1qdata_FUNC); - rc = (jintLong)g_object_get_qdata((GObject *)arg0, (GQuark)arg1); + rc = (jlong)g_object_get_qdata((GObject *)arg0, (GQuark)arg1); OS_NATIVE_EXIT(env, that, _1g_1object_1get_1qdata_FUNC); return rc; } #endif #ifndef NO__1g_1object_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1new) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1new) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1object_1new_FUNC); - rc = (jintLong)g_object_new((GType)arg0, (const gchar *)arg1); + rc = (jlong)g_object_new((GType)arg0, (const gchar *)arg1); OS_NATIVE_EXIT(env, that, _1g_1object_1new_FUNC); return rc; } @@ -15840,7 +15202,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1new) #ifndef NO__1g_1object_1notify JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1notify) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1g_1object_1notify_FUNC); @@ -15853,188 +15215,122 @@ fail: #endif #ifndef NO__1g_1object_1ref -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1ref) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1object_1ref_FUNC); - rc = (jintLong)g_object_ref((gpointer)arg0); + rc = (jlong)g_object_ref((gpointer)arg0); OS_NATIVE_EXIT(env, that, _1g_1object_1ref_FUNC); return rc; } #endif #ifndef NO__1g_1object_1ref_1sink -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref_1sink) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1ref_1sink) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1object_1ref_1sink_FUNC); - rc = (jintLong)g_object_ref_sink((GObject *)arg0); + rc = (jlong)g_object_ref_sink((GObject *)arg0); OS_NATIVE_EXIT(env, that, _1g_1object_1ref_1sink_FUNC); return rc; } #endif -#if (!defined(NO__1g_1object_1set__I_3BFI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BFJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BFJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1set__J_3BFJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BFJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jfloat arg2, jlong arg3) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BFJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BFJ_FUNC); -#endif } #endif -#if (!defined(NO__1g_1object_1set__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BIJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1set__J_3BIJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BIJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jlong arg3) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BIJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BIJ_FUNC); -#endif } #endif -#if (!defined(NO__1g_1object_1set__I_3BJI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1set__J_3BJJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BJJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BJJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BJJ_FUNC); -#endif } #endif -#if (!defined(NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jobject arg2, jlong arg3) { jbyte *lparg1=NULL; GdkRGBA _arg2, *lparg2=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail; g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); fail: if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC); -#endif } #endif -#if (!defined(NO__1g_1object_1set__I_3BZI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BZJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BZJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1set__J_3BZJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BZJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jboolean arg2, jlong arg3) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BZJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BZJ_FUNC); -#endif } #endif -#if (!defined(NO__1g_1object_1set__I_3B_3BI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3B_3BJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3B_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jintLong arg3) -#endif +#ifndef NO__1g_1object_1set__J_3B_3BJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3B_3BJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jlong arg3) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3B_3BI_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3B_3BJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL); fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3B_3BI_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3B_3BJ_FUNC); -#endif } #endif #ifndef NO__1g_1object_1set_1qdata JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { OS_NATIVE_ENTER(env, that, _1g_1object_1set_1qdata_FUNC); g_object_set_qdata((GObject *)arg0, (GQuark)arg1, (gpointer)arg2); @@ -16044,7 +15340,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata) #ifndef NO__1g_1object_1unref JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC); g_object_unref((gpointer)arg0); @@ -16083,12 +15379,12 @@ fail: #endif #ifndef NO__1g_1signal_1add_1emission_1hook -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook) - (JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1signal_1add_1emission_1hook_FUNC); - rc = (jintLong)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4); + rc = (jlong)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4); OS_NATIVE_EXIT(env, that, _1g_1signal_1add_1emission_1hook_FUNC); return rc; } @@ -16096,7 +15392,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook) #ifndef NO__1g_1signal_1connect JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3) { jbyte *lparg1=NULL; jint rc = 0; @@ -16112,7 +15408,7 @@ fail: #ifndef NO__1g_1signal_1connect_1closure JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jboolean arg3) { jbyte *lparg1=NULL; jint rc = 0; @@ -16128,7 +15424,7 @@ fail: #ifndef NO__1g_1signal_1connect_1closure_1by_1id JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jboolean arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3, jboolean arg4) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC); @@ -16138,140 +15434,85 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id) } #endif -#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -#endif +#ifndef NO__1g_1signal_1emit_1by_1name__J_3B +JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC); -#endif } #endif -#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BI) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) -#endif +#ifndef NO__1g_1signal_1emit_1by_1name__J_3BJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC); -#endif } #endif -#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3) -#endif +#ifndef NO__1g_1signal_1emit_1by_1name__J_3BJJ +JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJJ) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC); -#endif } #endif -#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2) -#endif +#ifndef NO__1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2 +JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jobject arg2) { jbyte *lparg1=NULL; GdkRectangle _arg2, *lparg2=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = getGdkRectangleFields(env, arg2, &_arg2)) == NULL) goto fail; g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2); fail: if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC); -#endif } #endif -#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B_3B) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) -#endif +#ifndef NO__1g_1signal_1emit_1by_1name__J_3B_3B +JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B_3B) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC); -#else OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC); -#else OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC); -#endif } #endif #ifndef NO__1g_1signal_1handler_1disconnect JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1disconnect_FUNC); g_signal_handler_disconnect((gpointer)arg0, (gulong)arg1); @@ -16281,7 +15522,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect) #ifndef NO__1g_1signal_1handler_1find JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handler_1find) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1find_FUNC); @@ -16293,7 +15534,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handler_1find) #ifndef NO__1g_1signal_1handlers_1block_1matched JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1block_1matched_FUNC); @@ -16305,7 +15546,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched) #ifndef NO__1g_1signal_1handlers_1unblock_1matched JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC); @@ -16317,7 +15558,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched) #ifndef NO__1g_1signal_1lookup JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1lookup) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; jint rc = 0; @@ -16333,7 +15574,7 @@ fail: #ifndef NO__1g_1signal_1remove_1emission_1hook JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1) + (JNIEnv *env, jclass that, jint arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1g_1signal_1remove_1emission_1hook_FUNC); g_signal_remove_emission_hook((guint)arg0, (gulong)arg1); @@ -16343,7 +15584,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook) #ifndef NO__1g_1signal_1stop_1emission_1by_1name JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1stop_1emission_1by_1name) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC); @@ -16356,24 +15597,24 @@ fail: #endif #ifndef NO__1g_1slist_1append -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1append) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1slist_1append) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1slist_1append_FUNC); - rc = (jintLong)g_slist_append((GSList *)arg0, (gpointer)arg1); + rc = (jlong)g_slist_append((GSList *)arg0, (gpointer)arg1); OS_NATIVE_EXIT(env, that, _1g_1slist_1append_FUNC); return rc; } #endif #ifndef NO__1g_1slist_1data -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1slist_1data) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1slist_1data_FUNC); - rc = (jintLong)g_slist_data((GSList *)arg0); + rc = (jlong)g_slist_data((GSList *)arg0); OS_NATIVE_EXIT(env, that, _1g_1slist_1data_FUNC); return rc; } @@ -16381,7 +15622,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data) #ifndef NO__1g_1slist_1free JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1slist_1free_FUNC); g_slist_free((GSList *)arg0); @@ -16391,7 +15632,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free) #ifndef NO__1g_1slist_1length JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1slist_1length_FUNC); @@ -16402,12 +15643,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length) #endif #ifndef NO__1g_1slist_1next -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1next) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1slist_1next) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1slist_1next_FUNC); - rc = (jintLong)g_slist_next((GSList *)arg0); + rc = (jlong)g_slist_next((GSList *)arg0); OS_NATIVE_EXIT(env, that, _1g_1slist_1next_FUNC); return rc; } @@ -16415,7 +15656,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1next) #ifndef NO__1g_1source_1remove JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1source_1remove_FUNC); @@ -16427,7 +15668,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove) #ifndef NO__1g_1strfreev JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1strfreev_FUNC); g_strfreev((gchar **)arg0); @@ -16436,24 +15677,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev) #endif #ifndef NO__1g_1string_1free -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1string_1free) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1string_1free) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1string_1free_FUNC); - rc = (jintLong)g_string_free((GString *)arg0, arg1); + rc = (jlong)g_string_free((GString *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1g_1string_1free_FUNC); return rc; } #endif #ifndef NO__1g_1string_1new_1len -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1string_1new_1len) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1string_1new_1len) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1string_1new_1len_FUNC); - rc = (jintLong)g_string_new_len((const gchar *)arg0, arg1); + rc = (jlong)g_string_new_len((const gchar *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1g_1string_1new_1len_FUNC); return rc; } @@ -16461,7 +15702,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1string_1new_1len) #ifndef NO__1g_1strtod JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1strtod) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1) { jintLong *lparg1=NULL; jdouble rc = 0; @@ -16477,7 +15718,7 @@ fail: #ifndef NO__1g_1timeout_1add JNIEXPORT jint JNICALL OS_NATIVE(_1g_1timeout_1add) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1timeout_1add_FUNC); @@ -16489,7 +15730,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1timeout_1add) #ifndef NO__1g_1type_1add_1interface_1static JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { OS_NATIVE_ENTER(env, that, _1g_1type_1add_1interface_1static_FUNC); g_type_add_interface_static((GType)arg0, (GType)arg1, (const GInterfaceInfo *)arg2); @@ -16498,36 +15739,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static) #endif #ifndef NO__1g_1type_1class_1peek -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1class_1peek) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_FUNC); - rc = (jintLong)g_type_class_peek((GType)arg0); + rc = (jlong)g_type_class_peek((GType)arg0); OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_FUNC); return rc; } #endif #ifndef NO__1g_1type_1class_1peek_1parent -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_1parent_FUNC); - rc = (jintLong)g_type_class_peek_parent((gpointer)arg0); + rc = (jlong)g_type_class_peek_parent((gpointer)arg0); OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_1parent_FUNC); return rc; } #endif #ifndef NO__1g_1type_1class_1ref -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1ref) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1class_1ref) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1type_1class_1ref_FUNC); - rc = (jintLong)g_type_class_ref((GType)arg0); + rc = (jlong)g_type_class_ref((GType)arg0); OS_NATIVE_EXIT(env, that, _1g_1type_1class_1ref_FUNC); return rc; } @@ -16535,7 +15776,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1ref) #ifndef NO__1g_1type_1class_1unref JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1class_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1type_1class_1unref_FUNC); g_type_class_unref((gpointer)arg0); @@ -16544,12 +15785,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1class_1unref) #endif #ifndef NO__1g_1type_1interface_1peek_1parent -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1type_1interface_1peek_1parent_FUNC); - rc = (jintLong)g_type_interface_peek_parent((gpointer)arg0); + rc = (jlong)g_type_interface_peek_parent((gpointer)arg0); OS_NATIVE_EXIT(env, that, _1g_1type_1interface_1peek_1parent_FUNC); return rc; } @@ -16557,7 +15798,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent) #ifndef NO__1g_1type_1is_1a JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1type_1is_1a_FUNC); @@ -16568,12 +15809,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a) #endif #ifndef NO__1g_1type_1parent -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1parent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1parent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1type_1parent_FUNC); - rc = (jintLong)g_type_parent((GType)arg0); + rc = (jlong)g_type_parent((GType)arg0); OS_NATIVE_EXIT(env, that, _1g_1type_1parent_FUNC); return rc; } @@ -16581,7 +15822,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1parent) #ifndef NO__1g_1type_1query JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1g_1type_1query_FUNC); g_type_query((GType)arg0, (GTypeQuery *)arg1); @@ -16590,14 +15831,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query) #endif #ifndef NO__1g_1type_1register_1static -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1register_1static) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1register_1static) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1type_1register_1static_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3); + rc = (jlong)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, _1g_1type_1register_1static_FUNC); @@ -16606,68 +15847,68 @@ fail: #endif #ifndef NO__1g_1utf16_1offset_1to_1pointer -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1pointer) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1pointer) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf16_1offset_1to_1pointer_FUNC); - rc = (jintLong)g_utf16_offset_to_pointer((const gchar *)arg0, arg1); + rc = (jlong)g_utf16_offset_to_pointer((const gchar *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1g_1utf16_1offset_1to_1pointer_FUNC); return rc; } #endif #ifndef NO__1g_1utf16_1offset_1to_1utf8_1offset -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1utf8_1offset) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1utf8_1offset) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf16_1offset_1to_1utf8_1offset_FUNC); - rc = (jintLong)g_utf16_offset_to_utf8_offset((const gchar *)arg0, arg1); + rc = (jlong)g_utf16_offset_to_utf8_offset((const gchar *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1g_1utf16_1offset_1to_1utf8_1offset_FUNC); return rc; } #endif #ifndef NO__1g_1utf16_1pointer_1to_1offset -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1pointer_1to_1offset) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1pointer_1to_1offset) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf16_1pointer_1to_1offset_FUNC); - rc = (jintLong)g_utf16_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1); + rc = (jlong)g_utf16_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1); OS_NATIVE_EXIT(env, that, _1g_1utf16_1pointer_1to_1offset_FUNC); return rc; } #endif #ifndef NO__1g_1utf16_1strlen -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1strlen) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1strlen) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf16_1strlen_FUNC); - rc = (jintLong)g_utf16_strlen((const gchar *)arg0, arg1); + rc = (jlong)g_utf16_strlen((const gchar *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1g_1utf16_1strlen_FUNC); return rc; } #endif #ifndef NO__1g_1utf16_1to_1utf8 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8) - (JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8) + (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) { jchar *lparg0=NULL; jintLong *lparg2=NULL; jintLong *lparg3=NULL; jintLong *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC); if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4); + rc = (jlong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4); fail: if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0); @@ -16679,67 +15920,67 @@ fail: #endif #ifndef NO__1g_1utf8_1offset_1to_1utf16_1offset -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1utf16_1offset) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1utf16_1offset) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf8_1offset_1to_1utf16_1offset_FUNC); - rc = (jintLong)g_utf8_offset_to_utf16_offset((const gchar *)arg0, arg1); + rc = (jlong)g_utf8_offset_to_utf16_offset((const gchar *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1g_1utf8_1offset_1to_1utf16_1offset_FUNC); return rc; } #endif #ifndef NO__1g_1utf8_1pointer_1to_1offset -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC); - rc = (jintLong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1); + rc = (jlong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1); OS_NATIVE_EXIT(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC); return rc; } #endif #ifndef NO__1g_1utf8_1strlen -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1strlen) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1strlen) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1utf8_1strlen_FUNC); - rc = (jintLong)g_utf8_strlen((const gchar *)arg0, arg1); + rc = (jlong)g_utf8_strlen((const gchar *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1g_1utf8_1strlen_FUNC); return rc; } #endif -#if (!defined(NO__1g_1utf8_1to_1utf16__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J) && defined(JNI64)) +#if (!defined(NO__1g_1utf8_1to_1utf16__JJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J) && defined(JNI64)) #ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3I_3I_3I)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) #else -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) #endif { jintLong *lparg2=NULL; jintLong *lparg3=NULL; jintLong *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; #ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC); + OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3I_3I_3I_FUNC); #else OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC); #endif if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4); + rc = (jlong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4); fail: if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0); #ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC); + OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3I_3I_3I_FUNC); #else OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC); #endif @@ -16747,20 +15988,20 @@ fail: } #endif -#if (!defined(NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J) && defined(JNI64)) +#if (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J) && defined(JNI64)) #ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3I_3I_3I)(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) #else -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) #endif { jbyte *lparg0=NULL; jintLong *lparg2=NULL; jintLong *lparg3=NULL; jintLong *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; #ifndef JNI64 - OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC); + OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3I_3I_3I_FUNC); #else OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC); #endif @@ -16768,14 +16009,14 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4); + rc = (jlong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4); fail: if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0); if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT); #ifndef JNI64 - OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC); + OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3I_3I_3I_FUNC); #else OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC); #endif @@ -16784,12 +16025,12 @@ fail: #endif #ifndef NO__1g_1value_1peek_1pointer -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1value_1peek_1pointer_FUNC); - rc = (jintLong)g_value_peek_pointer((const GValue *)arg0); + rc = (jlong)g_value_peek_pointer((const GValue *)arg0); OS_NATIVE_EXIT(env, that, _1g_1value_1peek_1pointer_FUNC); return rc; } @@ -16797,7 +16038,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer) #ifndef NO__1g_1variant_1builder_1add_1value JNIEXPORT void JNICALL OS_NATIVE(_1g_1variant_1builder_1add_1value) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1g_1variant_1builder_1add_1value_FUNC); g_variant_builder_add_value((GVariantBuilder *)arg0, (GVariant *)arg1); @@ -16806,24 +16047,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1variant_1builder_1add_1value) #endif #ifndef NO__1g_1variant_1builder_1end -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1builder_1end) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1builder_1end) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1builder_1end_FUNC); - rc = (jintLong)g_variant_builder_end((GVariantBuilder *)arg0); + rc = (jlong)g_variant_builder_end((GVariantBuilder *)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1builder_1end_FUNC); return rc; } #endif #ifndef NO__1g_1variant_1builder_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1builder_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1builder_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1builder_1new_FUNC); - rc = (jintLong)g_variant_builder_new((const GVariantType *)arg0); + rc = (jlong)g_variant_builder_new((const GVariantType *)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1builder_1new_FUNC); return rc; } @@ -16831,7 +16072,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1builder_1new) #ifndef NO__1g_1variant_1builder_1unref JNIEXPORT void JNICALL OS_NATIVE(_1g_1variant_1builder_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1g_1variant_1builder_1unref_FUNC); g_variant_builder_unref((GVariantBuilder *)arg0); @@ -16841,7 +16082,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1variant_1builder_1unref) #ifndef NO__1g_1variant_1get_1boolean JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1get_1boolean) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1boolean_FUNC); @@ -16853,7 +16094,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1get_1boolean) #ifndef NO__1g_1variant_1get_1byte JNIEXPORT jbyte JNICALL OS_NATIVE(_1g_1variant_1get_1byte) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jbyte rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1byte_FUNC); @@ -16864,12 +16105,12 @@ JNIEXPORT jbyte JNICALL OS_NATIVE(_1g_1variant_1get_1byte) #endif #ifndef NO__1g_1variant_1get_1child_1value -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1child_1value) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1get_1child_1value) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1child_1value_FUNC); - rc = (jintLong)g_variant_get_child_value((GVariant *)arg0, (gsize)arg1); + rc = (jlong)g_variant_get_child_value((GVariant *)arg0, (gsize)arg1); OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1child_1value_FUNC); return rc; } @@ -16877,7 +16118,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1child_1value) #ifndef NO__1g_1variant_1get_1double JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1variant_1get_1double) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1double_FUNC); @@ -16889,7 +16130,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1variant_1get_1double) #ifndef NO__1g_1variant_1get_1int32 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1variant_1get_1int32) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1int32_FUNC); @@ -16900,14 +16141,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1variant_1get_1int32) #endif #ifndef NO__1g_1variant_1get_1string -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1string) - (JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1get_1string) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { jlong *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1string_FUNC); if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)g_variant_get_string((GVariant *)arg0, (gsize *)lparg1); + rc = (jlong)g_variant_get_string((GVariant *)arg0, (gsize *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1string_FUNC); @@ -16916,24 +16157,24 @@ fail: #endif #ifndef NO__1g_1variant_1get_1type -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1type) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1get_1type) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1type_FUNC); - rc = (jintLong)g_variant_get_type((GVariant *)arg0); + rc = (jlong)g_variant_get_type((GVariant *)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1type_FUNC); return rc; } #endif #ifndef NO__1g_1variant_1get_1type_1string -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1type_1string) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1get_1type_1string) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1type_1string_FUNC); - rc = (jintLong)g_variant_get_type_string((GVariant *)arg0); + rc = (jlong)g_variant_get_type_string((GVariant *)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1type_1string_FUNC); return rc; } @@ -16941,7 +16182,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1type_1string) #ifndef NO__1g_1variant_1get_1uint64 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1get_1uint64) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1uint64_FUNC); @@ -16953,7 +16194,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1get_1uint64) #ifndef NO__1g_1variant_1is_1of_1type JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1is_1of_1type) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jboolean rc = 0; @@ -16980,62 +16221,62 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1n_1children) #endif #ifndef NO__1g_1variant_1new_1boolean -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1boolean) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1boolean) (JNIEnv *env, jclass that, jboolean arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1boolean_FUNC); - rc = (jintLong)g_variant_new_boolean((gboolean)arg0); + rc = (jlong)g_variant_new_boolean((gboolean)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1boolean_FUNC); return rc; } #endif #ifndef NO__1g_1variant_1new_1byte -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1byte) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1byte) (JNIEnv *env, jclass that, jbyte arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1byte_FUNC); - rc = (jintLong)g_variant_new_byte((guchar)arg0); + rc = (jlong)g_variant_new_byte((guchar)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1byte_FUNC); return rc; } #endif #ifndef NO__1g_1variant_1new_1double -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1double) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1double) (JNIEnv *env, jclass that, jdouble arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1double_FUNC); - rc = (jintLong)g_variant_new_double((gboolean)arg0); + rc = (jlong)g_variant_new_double((gboolean)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1double_FUNC); return rc; } #endif #ifndef NO__1g_1variant_1new_1int32 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1int32) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1int32) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1int32_FUNC); - rc = (jintLong)g_variant_new_int32((gint32)arg0); + rc = (jlong)g_variant_new_int32((gint32)arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1int32_FUNC); return rc; } #endif #ifndef NO__1g_1variant_1new_1string -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1string) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1string) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1string_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_variant_new_string((const gchar *)lparg0); + rc = (jlong)g_variant_new_string((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1string_FUNC); @@ -17044,14 +16285,14 @@ fail: #endif #ifndef NO__1g_1variant_1new_1tuple -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1tuple) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1tuple) (JNIEnv *env, jclass that, jintLongArray arg0, jlong arg1) { jintLong *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1tuple_FUNC); if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_variant_new_tuple((GVariant * const *)lparg0, (gsize)arg1); + rc = (jlong)g_variant_new_tuple((GVariant * const *)lparg0, (gsize)arg1); fail: if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1tuple_FUNC); @@ -17060,26 +16301,26 @@ fail: #endif #ifndef NO__1g_1variant_1new_1uint64 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1uint64) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1uint64) (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1uint64_FUNC); - rc = (jintLong)g_variant_new_uint64(arg0); + rc = (jlong)g_variant_new_uint64(arg0); OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1uint64_FUNC); return rc; } #endif #ifndef NO__1g_1variant_1type_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1type_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1type_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1variant_1type_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)g_variant_type_new((const gchar *)lparg0); + rc = (jlong)g_variant_type_new((const gchar *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, _1g_1variant_1type_1new_FUNC); @@ -17136,36 +16377,36 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1minor_1version) #endif #ifndef NO__1pango_1attr_1background_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1background_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1background_1new) (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1background_1new_FUNC); - rc = (jintLong)pango_attr_background_new(arg0, arg1, arg2); + rc = (jlong)pango_attr_background_new(arg0, arg1, arg2); OS_NATIVE_EXIT(env, that, _1pango_1attr_1background_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attr_1font_1desc_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1font_1desc_1new_FUNC); - rc = (jintLong)pango_attr_font_desc_new((const PangoFontDescription *)arg0); + rc = (jlong)pango_attr_font_desc_new((const PangoFontDescription *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1attr_1font_1desc_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attr_1foreground_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new) (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1foreground_1new_FUNC); - rc = (jintLong)pango_attr_foreground_new(arg0, arg1, arg2); + rc = (jlong)pango_attr_foreground_new(arg0, arg1, arg2); OS_NATIVE_EXIT(env, that, _1pango_1attr_1foreground_1new_FUNC); return rc; } @@ -17173,7 +16414,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new) #ifndef NO__1pango_1attr_1iterator_1destroy JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1destroy_FUNC); pango_attr_iterator_destroy((PangoAttrIterator *)arg0); @@ -17182,12 +16423,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1destroy) #endif #ifndef NO__1pango_1attr_1iterator_1get -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1get_FUNC); - rc = (jintLong)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1); + rc = (jlong)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1); OS_NATIVE_EXIT(env, that, _1pango_1attr_1iterator_1get_FUNC); return rc; } @@ -17195,7 +16436,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get) #ifndef NO__1pango_1attr_1iterator_1next JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1attr_1iterator_1next) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1next_FUNC); @@ -17207,7 +16448,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1attr_1iterator_1next) #ifndef NO__1pango_1attr_1iterator_1range JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1range) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -17223,12 +16464,12 @@ fail: #endif #ifndef NO__1pango_1attr_1list_1get_1iterator -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1get_1iterator_FUNC); - rc = (jintLong)pango_attr_list_get_iterator((PangoAttrList *)arg0); + rc = (jlong)pango_attr_list_get_iterator((PangoAttrList *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1get_1iterator_FUNC); return rc; } @@ -17236,7 +16477,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator) #ifndef NO__1pango_1attr_1list_1insert JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1insert) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1insert_FUNC); pango_attr_list_insert((PangoAttrList *)arg0, (PangoAttribute *)arg1); @@ -17245,12 +16486,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1insert) #endif #ifndef NO__1pango_1attr_1list_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1list_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1new_FUNC); - rc = (jintLong)pango_attr_list_new(); + rc = (jlong)pango_attr_list_new(); OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1new_FUNC); return rc; } @@ -17258,7 +16499,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1new) #ifndef NO__1pango_1attr_1list_1unref JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1unref_FUNC); pango_attr_list_unref((PangoAttrList *)arg0); @@ -17267,28 +16508,28 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1unref) #endif #ifndef NO__1pango_1attr_1rise_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1rise_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1rise_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1rise_1new_FUNC); - rc = (jintLong)pango_attr_rise_new(arg0); + rc = (jlong)pango_attr_rise_new(arg0); OS_NATIVE_EXIT(env, that, _1pango_1attr_1rise_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attr_1shape_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1shape_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1shape_1new) (JNIEnv *env, jclass that, jobject arg0, jobject arg1) { PangoRectangle _arg0, *lparg0=NULL; PangoRectangle _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1shape_1new_FUNC); if (arg0) if ((lparg0 = getPangoRectangleFields(env, arg0, &_arg0)) == NULL) goto fail; if (arg1) if ((lparg1 = getPangoRectangleFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)pango_attr_shape_new(lparg0, lparg1); + rc = (jlong)pango_attr_shape_new(lparg0, lparg1); fail: OS_NATIVE_EXIT(env, that, _1pango_1attr_1shape_1new_FUNC); return rc; @@ -17296,84 +16537,84 @@ fail: #endif #ifndef NO__1pango_1attr_1strikethrough_1color_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new) (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC); - rc = (jintLong)pango_attr_strikethrough_color_new(arg0, arg1, arg2); + rc = (jlong)pango_attr_strikethrough_color_new(arg0, arg1, arg2); OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attr_1strikethrough_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new) (JNIEnv *env, jclass that, jboolean arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1new_FUNC); - rc = (jintLong)pango_attr_strikethrough_new(arg0); + rc = (jlong)pango_attr_strikethrough_new(arg0); OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attr_1underline_1color_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new) (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1color_1new_FUNC); - rc = (jintLong)pango_attr_underline_color_new(arg0, arg1, arg2); + rc = (jlong)pango_attr_underline_color_new(arg0, arg1, arg2); OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1color_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attr_1underline_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1underline_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1new_FUNC); - rc = (jintLong)pango_attr_underline_new(arg0); + rc = (jlong)pango_attr_underline_new(arg0); OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attr_1weight_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1weight_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1weight_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attr_1weight_1new_FUNC); - rc = (jintLong)pango_attr_weight_new(arg0); + rc = (jlong)pango_attr_weight_new(arg0); OS_NATIVE_EXIT(env, that, _1pango_1attr_1weight_1new_FUNC); return rc; } #endif #ifndef NO__1pango_1attribute_1copy -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attribute_1copy) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attribute_1copy) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1attribute_1copy_FUNC); - rc = (jintLong)pango_attribute_copy((const PangoAttribute *)arg0); + rc = (jlong)pango_attribute_copy((const PangoAttribute *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1attribute_1copy_FUNC); return rc; } #endif #ifndef NO__1pango_1cairo_1context_1get_1font_1options -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC); - rc = (jintLong)pango_cairo_context_get_font_options((PangoContext *)arg0); + rc = (jlong)pango_cairo_context_get_font_options((PangoContext *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC); return rc; } @@ -17381,7 +16622,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options #ifndef NO__1pango_1cairo_1context_1set_1font_1options JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1set_1font_1options_FUNC); pango_cairo_context_set_font_options((PangoContext *)arg0, ( cairo_font_options_t *)arg1); @@ -17390,24 +16631,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options) #endif #ifndef NO__1pango_1cairo_1create_1layout -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1cairo_1create_1layout_FUNC); - rc = (jintLong)pango_cairo_create_layout((cairo_t *)arg0); + rc = (jlong)pango_cairo_create_layout((cairo_t *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1cairo_1create_1layout_FUNC); return rc; } #endif #ifndef NO__1pango_1cairo_1font_1map_1get_1default -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC); - rc = (jintLong)pango_cairo_font_map_get_default(); + rc = (jlong)pango_cairo_font_map_get_default(); OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC); return rc; } @@ -17415,7 +16656,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default) #ifndef NO__1pango_1cairo_1layout_1path JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1cairo_1layout_1path_FUNC); pango_cairo_layout_path((cairo_t *)arg0, (PangoLayout *)arg1); @@ -17425,7 +16666,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path) #ifndef NO__1pango_1cairo_1show_1layout JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1cairo_1show_1layout_FUNC); pango_cairo_show_layout((cairo_t *)arg0, (PangoLayout *)arg1); @@ -17435,7 +16676,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout) #ifndef NO__1pango_1context_1get_1base_1dir JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1base_1dir) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1base_1dir_FUNC); @@ -17446,24 +16687,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1base_1dir) #endif #ifndef NO__1pango_1context_1get_1language -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1context_1get_1language) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1context_1get_1language) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1language_FUNC); - rc = (jintLong)pango_context_get_language((PangoContext *)arg0); + rc = (jlong)pango_context_get_language((PangoContext *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1language_FUNC); return rc; } #endif #ifndef NO__1pango_1context_1get_1metrics -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1context_1get_1metrics) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1context_1get_1metrics) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1metrics_FUNC); - rc = (jintLong)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2); + rc = (jlong)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2); OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1metrics_FUNC); return rc; } @@ -17471,7 +16712,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1context_1get_1metrics) #ifndef NO__1pango_1context_1list_1families JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1list_1families) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintArray arg2) { jintLong *lparg1=NULL; jint *lparg2=NULL; @@ -17488,7 +16729,7 @@ fail: #ifndef NO__1pango_1context_1set_1base_1dir JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1base_1dir) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1base_1dir_FUNC); pango_context_set_base_dir((PangoContext *)arg0, arg1); @@ -17498,7 +16739,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1base_1dir) #ifndef NO__1pango_1context_1set_1language JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1language) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1language_FUNC); pango_context_set_language((PangoContext *)arg0, (PangoLanguage *)arg1); @@ -17507,12 +16748,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1language) #endif #ifndef NO__1pango_1font_1description_1copy -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1copy) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1copy) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1copy_FUNC); - rc = (jintLong)pango_font_description_copy((PangoFontDescription *)arg0); + rc = (jlong)pango_font_description_copy((PangoFontDescription *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1copy_FUNC); return rc; } @@ -17520,7 +16761,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1copy) #ifndef NO__1pango_1font_1description_1free JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1free_FUNC); pango_font_description_free((PangoFontDescription *)arg0); @@ -17529,14 +16770,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1free) #endif #ifndef NO__1pango_1font_1description_1from_1string -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1from_1string_FUNC); if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)pango_font_description_from_string((const char *)lparg0); + rc = (jlong)pango_font_description_from_string((const char *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT); OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1from_1string_FUNC); @@ -17545,12 +16786,12 @@ fail: #endif #ifndef NO__1pango_1font_1description_1get_1family -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1family_FUNC); - rc = (jintLong)pango_font_description_get_family((PangoFontDescription *)arg0); + rc = (jlong)pango_font_description_get_family((PangoFontDescription *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1get_1family_FUNC); return rc; } @@ -17558,7 +16799,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family) #ifndef NO__1pango_1font_1description_1get_1size JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1size_FUNC); @@ -17570,7 +16811,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size) #ifndef NO__1pango_1font_1description_1get_1stretch JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1stretch) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1stretch_FUNC); @@ -17582,7 +16823,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1stretch) #ifndef NO__1pango_1font_1description_1get_1style JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1style_FUNC); @@ -17594,7 +16835,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style) #ifndef NO__1pango_1font_1description_1get_1variant JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1variant) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1variant_FUNC); @@ -17606,7 +16847,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1variant) #ifndef NO__1pango_1font_1description_1get_1weight JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1weight_FUNC); @@ -17617,12 +16858,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight) #endif #ifndef NO__1pango_1font_1description_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1new_FUNC); - rc = (jintLong)pango_font_description_new(); + rc = (jlong)pango_font_description_new(); OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1new_FUNC); return rc; } @@ -17630,7 +16871,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1new) #ifndef NO__1pango_1font_1description_1set_1family JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1family) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1family_FUNC); @@ -17644,7 +16885,7 @@ fail: #ifndef NO__1pango_1font_1description_1set_1size JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1size) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1size_FUNC); pango_font_description_set_size((PangoFontDescription *)arg0, (gint)arg1); @@ -17654,7 +16895,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1size) #ifndef NO__1pango_1font_1description_1set_1stretch JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1stretch) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1stretch_FUNC); pango_font_description_set_stretch((PangoFontDescription *)arg0, (PangoStretch)arg1); @@ -17664,7 +16905,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1stretch) #ifndef NO__1pango_1font_1description_1set_1style JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1style) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1style_FUNC); pango_font_description_set_style((PangoFontDescription *)arg0, (PangoStyle)arg1); @@ -17674,7 +16915,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1style) #ifndef NO__1pango_1font_1description_1set_1variant JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1variant) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1variant_FUNC); pango_font_description_set_variant((PangoFontDescription *)arg0, (PangoVariant)arg1); @@ -17684,7 +16925,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1variant) #ifndef NO__1pango_1font_1description_1set_1weight JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1weight) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1weight_FUNC); pango_font_description_set_weight((PangoFontDescription *)arg0, (PangoWeight)arg1); @@ -17693,36 +16934,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1weight) #endif #ifndef NO__1pango_1font_1description_1to_1string -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1to_1string_FUNC); - rc = (jintLong)pango_font_description_to_string((PangoFontDescription *)arg0); + rc = (jlong)pango_font_description_to_string((PangoFontDescription *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1to_1string_FUNC); return rc; } #endif #ifndef NO__1pango_1font_1face_1describe -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1face_1describe) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1face_1describe) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1face_1describe_FUNC); - rc = (jintLong)pango_font_face_describe((PangoFontFace *)arg0); + rc = (jlong)pango_font_face_describe((PangoFontFace *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1font_1face_1describe_FUNC); return rc; } #endif #ifndef NO__1pango_1font_1family_1get_1name -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1get_1name_FUNC); - rc = (jintLong)pango_font_family_get_name((PangoFontFamily *)arg0); + rc = (jlong)pango_font_family_get_name((PangoFontFamily *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1get_1name_FUNC); return rc; } @@ -17730,7 +16971,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name) #ifndef NO__1pango_1font_1family_1list_1faces JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1family_1list_1faces) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintArray arg2) { jintLong *lparg1=NULL; jint *lparg2=NULL; @@ -17746,24 +16987,24 @@ fail: #endif #ifndef NO__1pango_1font_1get_1metrics -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1get_1metrics) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1get_1metrics) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1get_1metrics_FUNC); - rc = (jintLong)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1); + rc = (jlong)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1); OS_NATIVE_EXIT(env, that, _1pango_1font_1get_1metrics_FUNC); return rc; } #endif #ifndef NO__1pango_1font_1map_1create_1context -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1map_1create_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1map_1create_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1map_1create_1context_FUNC); - rc = (jintLong)pango_font_map_create_context((PangoFontMap *)arg0); + rc = (jlong)pango_font_map_create_context((PangoFontMap *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1font_1map_1create_1context_FUNC); return rc; } @@ -17771,7 +17012,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1map_1create_1context) #ifndef NO__1pango_1font_1metrics_1get_1approximate_1char_1width JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1approximate_1char_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1approximate_1char_1width_FUNC); @@ -17783,7 +17024,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1approximate_1char_ #ifndef NO__1pango_1font_1metrics_1get_1ascent JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1ascent) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1ascent_FUNC); @@ -17795,7 +17036,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1ascent) #ifndef NO__1pango_1font_1metrics_1get_1descent JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1descent) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1descent_FUNC); @@ -17807,7 +17048,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1descent) #ifndef NO__1pango_1font_1metrics_1unref JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1metrics_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1unref_FUNC); pango_font_metrics_unref((PangoFontMetrics *)arg0); @@ -17817,7 +17058,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1metrics_1unref) #ifndef NO__1pango_1layout_1context_1changed JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1context_1changed) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1context_1changed_FUNC); pango_layout_context_changed((PangoLayout *)arg0); @@ -17827,7 +17068,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1context_1changed) #ifndef NO__1pango_1layout_1get_1alignment JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1alignment) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1alignment_FUNC); @@ -17838,12 +17079,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1alignment) #endif #ifndef NO__1pango_1layout_1get_1context -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1context_FUNC); - rc = (jintLong)pango_layout_get_context((PangoLayout *)arg0); + rc = (jlong)pango_layout_get_context((PangoLayout *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1context_FUNC); return rc; } @@ -17851,7 +17092,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1context) #ifndef NO__1pango_1layout_1get_1indent JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1indent_FUNC); @@ -17862,12 +17103,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent) #endif #ifndef NO__1pango_1layout_1get_1iter -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1iter) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1iter) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1iter_FUNC); - rc = (jintLong)pango_layout_get_iter((PangoLayout*)arg0); + rc = (jlong)pango_layout_get_iter((PangoLayout*)arg0); OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1iter_FUNC); return rc; } @@ -17875,7 +17116,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1iter) #ifndef NO__1pango_1layout_1get_1justify JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1get_1justify) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1justify_FUNC); @@ -17886,12 +17127,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1get_1justify) #endif #ifndef NO__1pango_1layout_1get_1line -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1line) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1line) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_FUNC); - rc = (jintLong)pango_layout_get_line((PangoLayout *)arg0, arg1); + rc = (jlong)pango_layout_get_line((PangoLayout *)arg0, arg1); OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1line_FUNC); return rc; } @@ -17899,7 +17140,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1line) #ifndef NO__1pango_1layout_1get_1line_1count JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_1count_FUNC); @@ -17911,7 +17152,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count) #ifndef NO__1pango_1layout_1get_1log_1attrs JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1log_1attrs) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintArray arg2) { jintLong *lparg1=NULL; jint *lparg2=NULL; @@ -17928,7 +17169,7 @@ fail: #ifndef NO__1pango_1layout_1get_1pixel_1size JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1pixel_1size) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -17945,7 +17186,7 @@ fail: #ifndef NO__1pango_1layout_1get_1size JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1size) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -17962,7 +17203,7 @@ fail: #ifndef NO__1pango_1layout_1get_1spacing JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1spacing) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1spacing_FUNC); @@ -17973,12 +17214,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1spacing) #endif #ifndef NO__1pango_1layout_1get_1text -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1text) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1text) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1text_FUNC); - rc = (jintLong)pango_layout_get_text((PangoLayout *)arg0); + rc = (jlong)pango_layout_get_text((PangoLayout *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1text_FUNC); return rc; } @@ -17986,7 +17227,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1text) #ifndef NO__1pango_1layout_1get_1width JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1width) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1width_FUNC); @@ -17998,7 +17239,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1width) #ifndef NO__1pango_1layout_1index_1to_1pos JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1index_1to_1pos) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { PangoRectangle _arg2, *lparg2=NULL; OS_NATIVE_ENTER(env, that, _1pango_1layout_1index_1to_1pos_FUNC); @@ -18012,7 +17253,7 @@ fail: #ifndef NO__1pango_1layout_1iter_1free JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1free_FUNC); pango_layout_iter_free((PangoLayoutIter*)arg0); @@ -18022,7 +17263,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1free) #ifndef NO__1pango_1layout_1iter_1get_1index JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1index) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1index_FUNC); @@ -18034,7 +17275,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1index) #ifndef NO__1pango_1layout_1iter_1get_1line_1extents JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1line_1extents) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jobject arg2) { PangoRectangle _arg1, *lparg1=NULL; PangoRectangle _arg2, *lparg2=NULL; @@ -18050,12 +17291,12 @@ fail: #endif #ifndef NO__1pango_1layout_1iter_1get_1run -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1run_FUNC); - rc = (jintLong)pango_layout_iter_get_run((PangoLayoutIter*)arg0); + rc = (jlong)pango_layout_iter_get_run((PangoLayoutIter*)arg0); OS_NATIVE_EXIT(env, that, _1pango_1layout_1iter_1get_1run_FUNC); return rc; } @@ -18063,7 +17304,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run) #ifndef NO__1pango_1layout_1iter_1next_1line JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1line) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1line_FUNC); @@ -18075,7 +17316,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1line) #ifndef NO__1pango_1layout_1iter_1next_1run JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1run) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1run_FUNC); @@ -18087,7 +17328,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1run) #ifndef NO__1pango_1layout_1line_1get_1extents JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1line_1get_1extents) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jobject arg2) { PangoRectangle _arg1, *lparg1=NULL; PangoRectangle _arg2, *lparg2=NULL; @@ -18103,12 +17344,12 @@ fail: #endif #ifndef NO__1pango_1layout_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1layout_1new_FUNC); - rc = (jintLong)pango_layout_new((PangoContext *)arg0); + rc = (jlong)pango_layout_new((PangoContext *)arg0); OS_NATIVE_EXIT(env, that, _1pango_1layout_1new_FUNC); return rc; } @@ -18116,7 +17357,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1new) #ifndef NO__1pango_1layout_1set_1alignment JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1alignment) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1alignment_FUNC); pango_layout_set_alignment((PangoLayout *)arg0, arg1); @@ -18126,7 +17367,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1alignment) #ifndef NO__1pango_1layout_1set_1attributes JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1attributes_FUNC); pango_layout_set_attributes((PangoLayout *)arg0, (PangoAttrList *)arg1); @@ -18136,7 +17377,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes) #ifndef NO__1pango_1layout_1set_1auto_1dir JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1auto_1dir_FUNC); pango_layout_set_auto_dir((PangoLayout *)arg0, arg1); @@ -18146,7 +17387,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir) #ifndef NO__1pango_1layout_1set_1font_1description JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1font_1description_FUNC); pango_layout_set_font_description((PangoLayout *)arg0, (PangoFontDescription *)arg1); @@ -18156,7 +17397,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description) #ifndef NO__1pango_1layout_1set_1indent JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1indent) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1indent_FUNC); pango_layout_set_indent((PangoLayout*)arg0, arg1); @@ -18166,7 +17407,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1indent) #ifndef NO__1pango_1layout_1set_1justify JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1justify) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1justify_FUNC); pango_layout_set_justify((PangoLayout*)arg0, arg1); @@ -18176,7 +17417,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1justify) #ifndef NO__1pango_1layout_1set_1single_1paragraph_1mode JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1single_1paragraph_1mode) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1single_1paragraph_1mode_FUNC); pango_layout_set_single_paragraph_mode((PangoLayout *)arg0, (gboolean)arg1); @@ -18186,7 +17427,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1single_1paragraph_1mode) #ifndef NO__1pango_1layout_1set_1spacing JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1spacing) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1spacing_FUNC); pango_layout_set_spacing((PangoLayout *)arg0, arg1); @@ -18196,7 +17437,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1spacing) #ifndef NO__1pango_1layout_1set_1tabs JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1tabs) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1tabs_FUNC); pango_layout_set_tabs((PangoLayout *)arg0, (PangoTabArray *)arg1); @@ -18206,7 +17447,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1tabs) #ifndef NO__1pango_1layout_1set_1text JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1text_FUNC); @@ -18220,7 +17461,7 @@ fail: #ifndef NO__1pango_1layout_1set_1width JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1width) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1width_FUNC); pango_layout_set_width((PangoLayout *)arg0, arg1); @@ -18230,7 +17471,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1width) #ifndef NO__1pango_1layout_1set_1wrap JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1wrap) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1wrap_FUNC); pango_layout_set_wrap((PangoLayout *)arg0, arg1); @@ -18240,7 +17481,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1wrap) #ifndef NO__1pango_1layout_1xy_1to_1index JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1xy_1to_1index) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4) { jint *lparg3=NULL; jint *lparg4=NULL; @@ -18259,7 +17500,7 @@ fail: #ifndef NO__1pango_1tab_1array_1free JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1free_FUNC); pango_tab_array_free((PangoTabArray *)arg0); @@ -18268,12 +17509,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1free) #endif #ifndef NO__1pango_1tab_1array_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1tab_1array_1new) +JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1tab_1array_1new) (JNIEnv *env, jclass that, jint arg0, jboolean arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1new_FUNC); - rc = (jintLong)pango_tab_array_new((gint)arg0, (gboolean)arg1); + rc = (jlong)pango_tab_array_new((gint)arg0, (gboolean)arg1); OS_NATIVE_EXIT(env, that, _1pango_1tab_1array_1new_FUNC); return rc; } @@ -18281,7 +17522,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1tab_1array_1new) #ifndef NO__1pango_1tab_1array_1set_1tab JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1set_1tab) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3) { OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1set_1tab_FUNC); pango_tab_array_set_tab((PangoTabArray *)arg0, (gint)arg1, (PangoTabAlign)arg2, (gint)arg3); @@ -18300,12 +17541,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1swt_1debug_1on_1fatal_1warnings) #endif #ifndef NO__1swt_1fixed_1accessible_1get_1type -JNIEXPORT jintLong JNICALL OS_NATIVE(_1swt_1fixed_1accessible_1get_1type) +JNIEXPORT jlong JNICALL OS_NATIVE(_1swt_1fixed_1accessible_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1swt_1fixed_1accessible_1get_1type_FUNC); - rc = (jintLong)swt_fixed_accessible_get_type(); + rc = (jlong)swt_fixed_accessible_get_type(); OS_NATIVE_EXIT(env, that, _1swt_1fixed_1accessible_1get_1type_FUNC); return rc; } @@ -18313,7 +17554,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1swt_1fixed_1accessible_1get_1type) #ifndef NO__1swt_1fixed_1accessible_1register_1accessible JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1accessible_1register_1accessible) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1, jlong arg2) { OS_NATIVE_ENTER(env, that, _1swt_1fixed_1accessible_1register_1accessible_FUNC); swt_fixed_accessible_register_accessible((AtkObject*)arg0, (gboolean)arg1, (GtkWidget *)arg2); @@ -18322,12 +17563,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1accessible_1register_1accessible) #endif #ifndef NO__1swt_1fixed_1get_1type -JNIEXPORT jintLong JNICALL OS_NATIVE(_1swt_1fixed_1get_1type) +JNIEXPORT jlong JNICALL OS_NATIVE(_1swt_1fixed_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, _1swt_1fixed_1get_1type_FUNC); - rc = (jintLong)swt_fixed_get_type(); + rc = (jlong)swt_fixed_get_type(); OS_NATIVE_EXIT(env, that, _1swt_1fixed_1get_1type_FUNC); return rc; } @@ -18335,7 +17576,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1swt_1fixed_1get_1type) #ifndef NO__1swt_1fixed_1move JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1move) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { OS_NATIVE_ENTER(env, that, _1swt_1fixed_1move_FUNC); swt_fixed_move((SwtFixed*)arg0, (GtkWidget*)arg1, arg2, arg3); @@ -18345,7 +17586,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1move) #ifndef NO__1swt_1fixed_1resize JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1resize) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { OS_NATIVE_ENTER(env, that, _1swt_1fixed_1resize_FUNC); swt_fixed_resize((SwtFixed*)arg0, (GtkWidget*)arg1, arg2, arg3); @@ -18355,7 +17596,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1resize) #ifndef NO__1swt_1fixed_1restack JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1restack) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3) { OS_NATIVE_ENTER(env, that, _1swt_1fixed_1restack_FUNC); swt_fixed_restack((SwtFixed*)arg0, (GtkWidget*)arg1, (GtkWidget*)arg2, arg3); @@ -18385,7 +17626,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1ubuntu_1menu_1proxy_1get) #ifndef NO_g_1main_1context_1wakeup JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, g_1main_1context_1wakeup_FUNC); g_main_context_wakeup((GMainContext *)arg0); @@ -18394,12 +17635,12 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup) #endif #ifndef NO_g_1strdup -JNIEXPORT jintLong JNICALL OS_NATIVE(g_1strdup) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(g_1strdup) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, g_1strdup_FUNC); - rc = (jintLong)g_strdup((char *)arg0); + rc = (jlong)g_strdup((char *)arg0); OS_NATIVE_EXIT(env, that, g_1strdup_FUNC); return rc; } @@ -18407,7 +17648,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(g_1strdup) #ifndef NO_g_1value_1get_1double JNIEXPORT jdouble JNICALL OS_NATIVE(g_1value_1get_1double) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, g_1value_1get_1double_FUNC); @@ -18419,7 +17660,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(g_1value_1get_1double) #ifndef NO_g_1value_1get_1float JNIEXPORT jfloat JNICALL OS_NATIVE(g_1value_1get_1float) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jfloat rc = 0; OS_NATIVE_ENTER(env, that, g_1value_1get_1float_FUNC); @@ -18431,7 +17672,7 @@ JNIEXPORT jfloat JNICALL OS_NATIVE(g_1value_1get_1float) #ifndef NO_g_1value_1get_1int JNIEXPORT jint JNICALL OS_NATIVE(g_1value_1get_1int) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, g_1value_1get_1int_FUNC); @@ -18443,7 +17684,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1value_1get_1int) #ifndef NO_g_1value_1get_1int64 JNIEXPORT jlong JNICALL OS_NATIVE(g_1value_1get_1int64) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; OS_NATIVE_ENTER(env, that, g_1value_1get_1int64_FUNC); @@ -18454,12 +17695,12 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1value_1get_1int64) #endif #ifndef NO_g_1value_1init -JNIEXPORT jintLong JNICALL OS_NATIVE(g_1value_1init) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(g_1value_1init) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, g_1value_1init_FUNC); - rc = (jintLong)g_value_init((GValue *)arg0, (GType)arg1); + rc = (jlong)g_value_init((GValue *)arg0, (GType)arg1); OS_NATIVE_EXIT(env, that, g_1value_1init_FUNC); return rc; } @@ -18467,7 +17708,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(g_1value_1init) #ifndef NO_g_1value_1set_1double JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1double) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { OS_NATIVE_ENTER(env, that, g_1value_1set_1double_FUNC); g_value_set_double((GValue *)arg0, arg1); @@ -18477,7 +17718,7 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1double) #ifndef NO_g_1value_1set_1float JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1float) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { OS_NATIVE_ENTER(env, that, g_1value_1set_1float_FUNC); g_value_set_float((GValue *)arg0, arg1); @@ -18487,7 +17728,7 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1float) #ifndef NO_g_1value_1set_1int JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1int) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { OS_NATIVE_ENTER(env, that, g_1value_1set_1int_FUNC); g_value_set_int((GValue *)arg0, arg1); @@ -18497,7 +17738,7 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1int) #ifndef NO_g_1value_1set_1int64 JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1int64) - (JNIEnv *env, jclass that, jintLong arg0, jlong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { OS_NATIVE_ENTER(env, that, g_1value_1set_1int64_FUNC); g_value_set_int64((GValue *)arg0, arg1); @@ -18507,7 +17748,7 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1int64) #ifndef NO_g_1value_1unset JNIEXPORT void JNICALL OS_NATIVE(g_1value_1unset) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, g_1value_1unset_FUNC); g_value_unset((GValue *)arg0); @@ -18516,892 +17757,507 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1value_1unset) #endif #ifndef NO_localeconv_1decimal_1point -JNIEXPORT jintLong JNICALL OS_NATIVE(localeconv_1decimal_1point) +JNIEXPORT jlong JNICALL OS_NATIVE(localeconv_1decimal_1point) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, localeconv_1decimal_1point_FUNC); - rc = (jintLong)localeconv_decimal_point(); + rc = (jlong)localeconv_decimal_point(); OS_NATIVE_EXIT(env, that, localeconv_1decimal_1point_FUNC); return rc; } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { GInterfaceInfo _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC); -#endif if (arg1) if ((lparg1 = getGInterfaceInfoFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2 +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC); -#endif if (arg1) getGObjectClassFields(env, arg1, (GObjectClass *)arg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { GTypeInfo _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC); -#endif if (arg1) if ((lparg1 = getGTypeInfoFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { GdkEventButton _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC); -#endif if (arg1) if ((lparg1 = getGdkEventButtonFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { GdkEventKey _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J_FUNC); -#endif if (arg1) if ((lparg1 = getGdkEventKeyFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { GdkRGBA _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC); -#endif if (arg1) if ((lparg1 = getGdkRGBAFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2 +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC); -#endif if (arg1) getGtkCellRendererClassFields(env, arg1, (GtkCellRendererClass *)arg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { GtkTargetEntry _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC); -#endif if (arg1) if ((lparg1 = getGtkTargetEntryFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2 +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC); -#endif if (arg1) getGtkWidgetClassFields(env, arg1, (GtkWidgetClass *)arg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { PangoAttribute _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC); -#endif if (arg1) if ((lparg1 = getPangoAttributeFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif +#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { XExposeEvent _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC); -#endif if (arg1) if ((lparg1 = getXExposeEventFields(env, arg1, &_arg1)) == NULL) goto fail; memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC); -#endif if (arg0) setGObjectClassFields(env, arg0, (GObjectClass *)arg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GTypeQuery _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGTypeQueryFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkEventButton _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventButtonFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkEventCrossing _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventCrossingFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkEventExpose _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventExposeFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkEventFocus _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventFocusFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkEventKey _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventKeyFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkEventMotion _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventMotionFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkEventWindowState _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventWindowStateFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkKeymapKey _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkKeymapKeyFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkRGBA _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GdkRectangle _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkRectangleFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GtkBorder _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGtkBorderFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC); -#endif if (arg0) setGtkCellRendererClassFields(env, arg0, (GtkCellRendererClass *)arg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC); -#endif if (arg0) setGtkWidgetClassFields(env, arg0, (GtkWidgetClass *)arg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { PangoAttrColor _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoAttrColorFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { PangoAttrInt _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoAttrIntFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { PangoAttribute _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoAttributeFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { PangoItem _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoItemFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { PangoLayoutLine _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoLayoutLineFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { PangoLayoutRun _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoLayoutRunFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { PangoLogAttr _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoLogAttrFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { XExposeEvent _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setXExposeEventFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC); -#endif } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif +#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ +JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { XFocusChangeEvent _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC); -#endif if (!arg0) goto fail; if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setXFocusChangeEventFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC); -#endif } #endif #ifndef NO_realpath -JNIEXPORT jintLong JNICALL OS_NATIVE(realpath) +JNIEXPORT jlong JNICALL OS_NATIVE(realpath) (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1) { jbyte *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, realpath_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)realpath((const char *)lparg0, (char *)lparg1); + rc = (jlong)realpath((const char *)lparg0, (char *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); @@ -19386,7 +18253,7 @@ fail: #ifndef NO_strcmp JNIEXPORT jint JNICALL OS_NATIVE(strcmp) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jint rc = 0; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index eebda3da4c..8ea3bc8038 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -51,16 +51,8 @@ "_1gdk_1cairo_1set_1source_1rgba", "_1gdk_1cairo_1set_1source_1window", "_1gdk_1cursor_1new_1for_1display", -#ifndef JNI64 - "_1gdk_1cursor_1new_1from_1name__I_3B", -#else "_1gdk_1cursor_1new_1from_1name__J_3B", -#endif -#ifndef JNI64 - "_1gdk_1cursor_1new_1from_1name___3BI", -#else "_1gdk_1cursor_1new_1from_1name___3BJ", -#endif "_1gdk_1cursor_1new_1from_1pixbuf", "_1gdk_1cursor_1new_1from_1texture", "_1gdk_1device_1get_1associated_1device", @@ -70,16 +62,8 @@ "_1gdk_1device_1grab", "_1gdk_1device_1manager_1get_1client_1pointer", "_1gdk_1device_1ungrab", -#ifndef JNI64 - "_1gdk_1device_1warp__III", -#else "_1gdk_1device_1warp__JII", -#endif -#ifndef JNI64 - "_1gdk_1device_1warp__IIII", -#else "_1gdk_1device_1warp__JJII", -#endif "_1gdk_1display_1beep", "_1gdk_1display_1get_1default", "_1gdk_1display_1get_1default_1group", @@ -346,27 +330,10 @@ "_1gtk_1bin_1get_1child", "_1gtk_1border_1free", "_1gtk_1box_1new", -#ifndef JNI64 - "_1gtk_1box_1pack_1end__II", -#else "_1gtk_1box_1pack_1end__JJ", -#endif -#ifndef JNI64 - "_1gtk_1box_1pack_1end__IIZZI", -#else "_1gtk_1box_1pack_1end__JJZZI", -#endif - "_1gtk_1box_1reorder_1child", -#ifndef JNI64 - "_1gtk_1box_1set_1child_1packing__III", -#else "_1gtk_1box_1set_1child_1packing__JJI", -#endif -#ifndef JNI64 - "_1gtk_1box_1set_1child_1packing__IIZZII", -#else "_1gtk_1box_1set_1child_1packing__JJZZII", -#endif "_1gtk_1box_1set_1homogeneous", "_1gtk_1box_1set_1spacing", "_1gtk_1button_1clicked", @@ -430,45 +397,22 @@ "_1gtk_1container_1remove", "_1gtk_1container_1set_1border_1width", "_1gtk_1css_1provider_1get_1named", -#ifndef JNI64 - "_1gtk_1css_1provider_1load_1from_1data__I_3BI", -#else "_1gtk_1css_1provider_1load_1from_1data__J_3BJ", -#endif -#ifndef JNI64 - "_1gtk_1css_1provider_1load_1from_1data__I_3BI_3I", -#else "_1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J", -#endif "_1gtk_1css_1provider_1new", "_1gtk_1css_1provider_1to_1string", "_1gtk_1dialog_1add_1button", "_1gtk_1dialog_1run", -#ifndef JNI64 - "_1gtk_1drag_1begin_1with_1coordinates__IIIIII", -#else "_1gtk_1drag_1begin_1with_1coordinates__JJJIII", -#endif -#ifndef JNI64 - "_1gtk_1drag_1begin_1with_1coordinates__IIIIIII", -#else "_1gtk_1drag_1begin_1with_1coordinates__JJIIJII", -#endif + "_1gtk_1drag_1begin_1with_1coordinates__JJJIII", "_1gtk_1drag_1check_1threshold", "_1gtk_1drag_1dest_1find_1target", "_1gtk_1drag_1dest_1set", "_1gtk_1drag_1dest_1unset", "_1gtk_1drag_1finish", -#ifndef JNI64 - "_1gtk_1drag_1get_1data__III", -#else "_1gtk_1drag_1get_1data__JJJ", -#endif -#ifndef JNI64 - "_1gtk_1drag_1get_1data__IIII", -#else "_1gtk_1drag_1get_1data__JJJI", -#endif "_1gtk_1drag_1set_1icon_1surface", "_1gtk_1editable_1copy_1clipboard", "_1gtk_1editable_1cut_1clipboard", @@ -516,16 +460,8 @@ "_1gtk_1expander_1set_1expanded", "_1gtk_1expander_1set_1label_1widget", "_1gtk_1file_1chooser_1add_1filter", -#ifndef JNI64 - "_1gtk_1file_1chooser_1dialog_1new___3BIIIIIII", -#else "_1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ", -#endif -#ifndef JNI64 - "_1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII", -#else "_1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ", -#endif "_1gtk_1file_1chooser_1get_1filename", "_1gtk_1file_1chooser_1get_1filenames", "_1gtk_1file_1chooser_1get_1filter", @@ -602,34 +538,14 @@ "_1gtk_1image_1new_1from_1icon_1name___3B", "_1gtk_1image_1new_1from_1icon_1name___3BI", "_1gtk_1image_1new_1from_1pixbuf", -#ifndef JNI64 - "_1gtk_1image_1set_1from_1gicon__II", -#else "_1gtk_1image_1set_1from_1gicon__JJ", -#endif -#ifndef JNI64 - "_1gtk_1image_1set_1from_1gicon__III", -#else "_1gtk_1image_1set_1from_1gicon__JJI", -#endif -#ifndef JNI64 - "_1gtk_1image_1set_1from_1icon_1name__I_3B", -#else "_1gtk_1image_1set_1from_1icon_1name__J_3B", -#endif -#ifndef JNI64 - "_1gtk_1image_1set_1from_1icon_1name__I_3BI", -#else "_1gtk_1image_1set_1from_1icon_1name__J_3BI", -#endif "_1gtk_1image_1set_1from_1pixbuf", "_1gtk_1image_1set_1pixel_1size", "_1gtk_1init_1check__", -#ifndef JNI64 - "_1gtk_1init_1check___3I_3I", -#else "_1gtk_1init_1check___3J_3J", -#endif "_1gtk_1label_1get_1layout", "_1gtk_1label_1get_1mnemonic_1keyval", "_1gtk_1label_1new", @@ -638,16 +554,8 @@ "_1gtk_1label_1set_1justify", "_1gtk_1label_1set_1line_1wrap", "_1gtk_1label_1set_1line_1wrap_1mode", -#ifndef JNI64 - "_1gtk_1label_1set_1text__II", -#else "_1gtk_1label_1set_1text__JJ", -#endif -#ifndef JNI64 - "_1gtk_1label_1set_1text__I_3B", -#else "_1gtk_1label_1set_1text__J_3B", -#endif "_1gtk_1label_1set_1text_1with_1mnemonic", "_1gtk_1label_1set_1xalign", "_1gtk_1label_1set_1yalign", @@ -656,31 +564,11 @@ "_1gtk_1list_1store_1insert", "_1gtk_1list_1store_1newv", "_1gtk_1list_1store_1remove", -#ifndef JNI64 - "_1gtk_1list_1store_1set__IIIII", -#else "_1gtk_1list_1store_1set__JJIII", -#endif -#ifndef JNI64 - "_1gtk_1list_1store_1set__IIIJI", -#else "_1gtk_1list_1store_1set__JJIJI", -#endif -#ifndef JNI64 - "_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I", -#else "_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I", -#endif -#ifndef JNI64 - "_1gtk_1list_1store_1set__IIIZI", -#else "_1gtk_1list_1store_1set__JJIZI", -#endif -#ifndef JNI64 - "_1gtk_1list_1store_1set__III_3BI", -#else "_1gtk_1list_1store_1set__JJI_3BI", -#endif "_1gtk_1main", "_1gtk_1main_1do_1event", "_1gtk_1menu_1bar_1new", @@ -845,48 +733,15 @@ "_1gtk_1style_1context_1add_1provider", "_1gtk_1style_1context_1add_1provider_1for_1display", "_1gtk_1style_1context_1add_1provider_1for_1screen", -#ifndef JNI64 - "_1gtk_1style_1context_1get__II_3B_3II", -#else "_1gtk_1style_1context_1get__JI_3B_3JJ", -#endif -#ifndef JNI64 - "_1gtk_1style_1context_1get__I_3B_3II", -#else "_1gtk_1style_1context_1get__J_3B_3JJ", -#endif - "_1gtk_1style_1context_1get_1background_1color", -#ifndef JNI64 - "_1gtk_1style_1context_1get_1border__IILorg_eclipse_swt_internal_gtk_GtkBorder_2", -#else "_1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2", -#endif -#ifndef JNI64 - "_1gtk_1style_1context_1get_1border__ILorg_eclipse_swt_internal_gtk_GtkBorder_2", -#else "_1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2", -#endif -#ifndef JNI64 - "_1gtk_1style_1context_1get_1color__IILorg_eclipse_swt_internal_gtk_GdkRGBA_2", -#else "_1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2", -#endif -#ifndef JNI64 - "_1gtk_1style_1context_1get_1color__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2", -#else "_1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2", -#endif "_1gtk_1style_1context_1get_1font", -#ifndef JNI64 - "_1gtk_1style_1context_1get_1padding__IILorg_eclipse_swt_internal_gtk_GtkBorder_2", -#else "_1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2", -#endif -#ifndef JNI64 - "_1gtk_1style_1context_1get_1padding__ILorg_eclipse_swt_internal_gtk_GtkBorder_2", -#else "_1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2", -#endif "_1gtk_1style_1context_1invalidate", "_1gtk_1style_1context_1remove_1class", "_1gtk_1style_1context_1restore", @@ -908,16 +763,8 @@ "_1gtk_1text_1buffer_1get_1selection_1bound", "_1gtk_1text_1buffer_1get_1selection_1bounds", "_1gtk_1text_1buffer_1get_1text", -#ifndef JNI64 - "_1gtk_1text_1buffer_1insert__II_3BI", -#else "_1gtk_1text_1buffer_1insert__JJ_3BI", -#endif -#ifndef JNI64 - "_1gtk_1text_1buffer_1insert__I_3B_3BI", -#else "_1gtk_1text_1buffer_1insert__J_3B_3BI", -#endif "_1gtk_1text_1buffer_1paste_1clipboard", "_1gtk_1text_1buffer_1place_1cursor", "_1gtk_1text_1buffer_1select_1range", @@ -963,16 +810,8 @@ "_1gtk_1toolbar_1set_1icon_1size", "_1gtk_1toolbar_1set_1show_1arrow", "_1gtk_1toolbar_1set_1style", -#ifndef JNI64 - "_1gtk_1tree_1model_1get__III_3II", -#else "_1gtk_1tree_1model_1get__JJI_3II", -#endif -#ifndef JNI64 - "_1gtk_1tree_1model_1get__III_3JI", -#else "_1gtk_1tree_1model_1get__JJI_3JI", -#endif "_1gtk_1tree_1model_1get_1iter", "_1gtk_1tree_1model_1get_1iter_1first", "_1gtk_1tree_1model_1get_1n_1columns", @@ -988,11 +827,7 @@ "_1gtk_1tree_1path_1get_1depth", "_1gtk_1tree_1path_1get_1indices", "_1gtk_1tree_1path_1new", -#ifndef JNI64 - "_1gtk_1tree_1path_1new_1from_1string__I", -#else "_1gtk_1tree_1path_1new_1from_1string__J", -#endif "_1gtk_1tree_1path_1new_1from_1string___3B", "_1gtk_1tree_1path_1next", "_1gtk_1tree_1path_1prev", @@ -1014,31 +849,11 @@ "_1gtk_1tree_1store_1insert", "_1gtk_1tree_1store_1newv", "_1gtk_1tree_1store_1remove", -#ifndef JNI64 - "_1gtk_1tree_1store_1set__IIIII", -#else "_1gtk_1tree_1store_1set__JJIII", -#endif -#ifndef JNI64 - "_1gtk_1tree_1store_1set__IIIJI", -#else "_1gtk_1tree_1store_1set__JJIJI", -#endif -#ifndef JNI64 - "_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I", -#else "_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I", -#endif -#ifndef JNI64 - "_1gtk_1tree_1store_1set__IIIZI", -#else "_1gtk_1tree_1store_1set__JJIZI", -#endif -#ifndef JNI64 - "_1gtk_1tree_1store_1set__III_3BI", -#else "_1gtk_1tree_1store_1set__JJI_3BI", -#endif "_1gtk_1tree_1view_1collapse_1row", "_1gtk_1tree_1view_1column_1add_1attribute", "_1gtk_1tree_1view_1column_1cell_1get_1position", @@ -1101,16 +916,8 @@ "_1gtk_1widget_1add_1events", "_1gtk_1widget_1child_1focus", "_1gtk_1widget_1class_1get_1css_1name", -#ifndef JNI64 - "_1gtk_1widget_1create_1pango_1layout__II", -#else "_1gtk_1widget_1create_1pango_1layout__JJ", -#endif -#ifndef JNI64 - "_1gtk_1widget_1create_1pango_1layout__I_3B", -#else "_1gtk_1widget_1create_1pango_1layout__J_3B", -#endif "_1gtk_1widget_1destroy", "_1gtk_1widget_1draw", "_1gtk_1widget_1event", @@ -1196,27 +1003,11 @@ "_1gtk_1widget_1set_1visible", "_1gtk_1widget_1shape_1combine_1region", "_1gtk_1widget_1show", -#ifndef JNI64 - "_1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2", -#else "_1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2", -#endif -#ifndef JNI64 - "_1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2I", -#else "_1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I", -#endif "_1gtk_1widget_1snapshot_1child", -#ifndef JNI64 - "_1gtk_1widget_1style_1get__I_3B_3II", -#else "_1gtk_1widget_1style_1get__J_3B_3IJ", -#endif -#ifndef JNI64 - "_1gtk_1widget_1style_1get__I_3B_3JI", -#else "_1gtk_1widget_1style_1get__J_3B_3JJ", -#endif "_1gtk_1widget_1translate_1coordinates", "_1gtk_1window_1activate_1default", "_1gtk_1window_1add_1accel_1group", @@ -1316,16 +1107,8 @@ #ifdef NATIVE_STATS char * OS_nativeFunctionNames[] = { -#ifndef JNI64 - "Call__IIII", -#else "Call__JJII", -#endif -#ifndef JNI64 - "Call__IIIJ", -#else "Call__JJIJ", -#endif "GDK_1WINDOWING_1WAYLAND", "GDK_1WINDOWING_1X11", "GInterfaceInfo_1sizeof", @@ -1384,21 +1167,9 @@ "_1XSynchronize", "_1access", "_1cachejvmptr", -#ifndef JNI64 - "_1call__IIIII", -#else "_1call__JJJJJ", -#endif -#ifndef JNI64 - "_1call__IIIIIII", -#else "_1call__JJJJJJJ", -#endif -#ifndef JNI64 - "_1call__IIIIIIII", -#else "_1call__JJJJJJJJ", -#endif "_1dlopen", "_1g_1app_1info_1create_1from_1commandline", "_1g_1app_1info_1get_1all", @@ -1473,51 +1244,19 @@ "_1g_1main_1context_1release", "_1g_1malloc", "_1g_1object_1class_1find_1property", -#ifndef JNI64 - "_1g_1object_1get__I_3B_3II", -#else "_1g_1object_1get__J_3B_3IJ", -#endif -#ifndef JNI64 - "_1g_1object_1get__I_3B_3JI", -#else "_1g_1object_1get__J_3B_3JJ", -#endif "_1g_1object_1get_1qdata", "_1g_1object_1new", "_1g_1object_1notify", "_1g_1object_1ref", "_1g_1object_1ref_1sink", -#ifndef JNI64 - "_1g_1object_1set__I_3BFI", -#else "_1g_1object_1set__J_3BFJ", -#endif -#ifndef JNI64 - "_1g_1object_1set__I_3BII", -#else "_1g_1object_1set__J_3BIJ", -#endif -#ifndef JNI64 - "_1g_1object_1set__I_3BJI", -#else "_1g_1object_1set__J_3BJJ", -#endif -#ifndef JNI64 - "_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I", -#else "_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J", -#endif -#ifndef JNI64 - "_1g_1object_1set__I_3BZI", -#else "_1g_1object_1set__J_3BZJ", -#endif -#ifndef JNI64 - "_1g_1object_1set__I_3B_3BI", -#else "_1g_1object_1set__J_3B_3BJ", -#endif "_1g_1object_1set_1qdata", "_1g_1object_1unref", "_1g_1quark_1from_1string", @@ -1526,31 +1265,11 @@ "_1g_1signal_1connect", "_1g_1signal_1connect_1closure", "_1g_1signal_1connect_1closure_1by_1id", -#ifndef JNI64 - "_1g_1signal_1emit_1by_1name__I_3B", -#else "_1g_1signal_1emit_1by_1name__J_3B", -#endif -#ifndef JNI64 - "_1g_1signal_1emit_1by_1name__I_3BI", -#else "_1g_1signal_1emit_1by_1name__J_3BJ", -#endif -#ifndef JNI64 - "_1g_1signal_1emit_1by_1name__I_3BII", -#else "_1g_1signal_1emit_1by_1name__J_3BJJ", -#endif -#ifndef JNI64 - "_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2", -#else "_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2", -#endif -#ifndef JNI64 - "_1g_1signal_1emit_1by_1name__I_3B_3B", -#else "_1g_1signal_1emit_1by_1name__J_3B_3B", -#endif "_1g_1signal_1handler_1disconnect", "_1g_1signal_1handler_1find", "_1g_1signal_1handlers_1block_1matched", @@ -1588,12 +1307,12 @@ "_1g_1utf8_1pointer_1to_1offset", "_1g_1utf8_1strlen", #ifndef JNI64 - "_1g_1utf8_1to_1utf16__II_3I_3I_3I", + "_1g_1utf8_1to_1utf16__JJ_3I_3I_3I", #else "_1g_1utf8_1to_1utf16__JJ_3J_3J_3J", #endif #ifndef JNI64 - "_1g_1utf8_1to_1utf16___3BI_3I_3I_3I", + "_1g_1utf8_1to_1utf16___3BJ_3I_3I_3I", #else "_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J", #endif @@ -1744,181 +1463,41 @@ "imContextLast", "imContextNewProc_1CALLBACK", "localeconv_1decimal_1point", -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2", -#else "memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I", -#else "memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I", -#else "memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II", -#else "memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ", -#endif "pangoFontFaceNewProc_1CALLBACK", "pangoFontFamilyNewProc_1CALLBACK", "pangoLayoutNewProc_1CALLBACK", diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index 114a21762a..98a58f57ba 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -60,16 +60,8 @@ typedef enum { _1gdk_1cairo_1set_1source_1rgba_FUNC, _1gdk_1cairo_1set_1source_1window_FUNC, _1gdk_1cursor_1new_1for_1display_FUNC, -#ifndef JNI64 - _1gdk_1cursor_1new_1from_1name__I_3B_FUNC, -#else _1gdk_1cursor_1new_1from_1name__J_3B_FUNC, -#endif -#ifndef JNI64 - _1gdk_1cursor_1new_1from_1name___3BI_FUNC, -#else _1gdk_1cursor_1new_1from_1name___3BJ_FUNC, -#endif _1gdk_1cursor_1new_1from_1pixbuf_FUNC, _1gdk_1cursor_1new_1from_1texture_FUNC, _1gdk_1device_1get_1associated_1device_FUNC, @@ -79,16 +71,8 @@ typedef enum { _1gdk_1device_1grab_FUNC, _1gdk_1device_1manager_1get_1client_1pointer_FUNC, _1gdk_1device_1ungrab_FUNC, -#ifndef JNI64 - _1gdk_1device_1warp__III_FUNC, -#else _1gdk_1device_1warp__JII_FUNC, -#endif -#ifndef JNI64 - _1gdk_1device_1warp__IIII_FUNC, -#else _1gdk_1device_1warp__JJII_FUNC, -#endif _1gdk_1display_1beep_FUNC, _1gdk_1display_1get_1default_FUNC, _1gdk_1display_1get_1default_1group_FUNC, @@ -344,27 +328,11 @@ typedef enum { _1gtk_1bin_1get_1child_FUNC, _1gtk_1border_1free_FUNC, _1gtk_1box_1new_FUNC, -#ifndef JNI64 - _1gtk_1box_1pack_1end__II_FUNC, -#else _1gtk_1box_1pack_1end__JJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1box_1pack_1end__IIZZI_FUNC, -#else _1gtk_1box_1pack_1end__JJZZI_FUNC, -#endif _1gtk_1box_1reorder_1child_FUNC, -#ifndef JNI64 - _1gtk_1box_1set_1child_1packing__III_FUNC, -#else _1gtk_1box_1set_1child_1packing__JJI_FUNC, -#endif -#ifndef JNI64 - _1gtk_1box_1set_1child_1packing__IIZZII_FUNC, -#else _1gtk_1box_1set_1child_1packing__JJZZII_FUNC, -#endif _1gtk_1box_1set_1homogeneous_FUNC, _1gtk_1box_1set_1spacing_FUNC, _1gtk_1button_1clicked_FUNC, @@ -428,45 +396,21 @@ typedef enum { _1gtk_1container_1remove_FUNC, _1gtk_1container_1set_1border_1width_FUNC, _1gtk_1css_1provider_1get_1named_FUNC, -#ifndef JNI64 - _1gtk_1css_1provider_1load_1from_1data__I_3BI_FUNC, -#else _1gtk_1css_1provider_1load_1from_1data__J_3BJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1css_1provider_1load_1from_1data__I_3BI_3I_FUNC, -#else _1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J_FUNC, -#endif _1gtk_1css_1provider_1new_FUNC, _1gtk_1css_1provider_1to_1string_FUNC, _1gtk_1dialog_1add_1button_FUNC, _1gtk_1dialog_1run_FUNC, -#ifndef JNI64 - _1gtk_1drag_1begin_1with_1coordinates__IIIIII_FUNC, -#else - _1gtk_1drag_1begin_1with_1coordinates__JJJIII_FUNC, -#endif -#ifndef JNI64 - _1gtk_1drag_1begin_1with_1coordinates__IIIIIII_FUNC, -#else _1gtk_1drag_1begin_1with_1coordinates__JJIIJII_FUNC, -#endif + _1gtk_1drag_1begin_1with_1coordinates__JJJIII_FUNC, _1gtk_1drag_1check_1threshold_FUNC, _1gtk_1drag_1dest_1find_1target_FUNC, _1gtk_1drag_1dest_1set_FUNC, _1gtk_1drag_1dest_1unset_FUNC, _1gtk_1drag_1finish_FUNC, -#ifndef JNI64 - _1gtk_1drag_1get_1data__III_FUNC, -#else _1gtk_1drag_1get_1data__JJJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1drag_1get_1data__IIII_FUNC, -#else _1gtk_1drag_1get_1data__JJJI_FUNC, -#endif _1gtk_1drag_1set_1icon_1surface_FUNC, _1gtk_1editable_1copy_1clipboard_FUNC, _1gtk_1editable_1cut_1clipboard_FUNC, @@ -514,16 +458,8 @@ typedef enum { _1gtk_1expander_1set_1expanded_FUNC, _1gtk_1expander_1set_1label_1widget_FUNC, _1gtk_1file_1chooser_1add_1filter_FUNC, -#ifndef JNI64 - _1gtk_1file_1chooser_1dialog_1new___3BIIIIIII_FUNC, -#else _1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII_FUNC, -#else _1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC, -#endif _1gtk_1file_1chooser_1get_1filename_FUNC, _1gtk_1file_1chooser_1get_1filenames_FUNC, _1gtk_1file_1chooser_1get_1filter_FUNC, @@ -600,26 +536,10 @@ typedef enum { _1gtk_1image_1new_1from_1icon_1name___3B_FUNC, _1gtk_1image_1new_1from_1icon_1name___3BI_FUNC, _1gtk_1image_1new_1from_1pixbuf_FUNC, -#ifndef JNI64 - _1gtk_1image_1set_1from_1gicon__II_FUNC, -#else _1gtk_1image_1set_1from_1gicon__JJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1image_1set_1from_1gicon__III_FUNC, -#else _1gtk_1image_1set_1from_1gicon__JJI_FUNC, -#endif -#ifndef JNI64 - _1gtk_1image_1set_1from_1icon_1name__I_3B_FUNC, -#else _1gtk_1image_1set_1from_1icon_1name__J_3B_FUNC, -#endif -#ifndef JNI64 - _1gtk_1image_1set_1from_1icon_1name__I_3BI_FUNC, -#else _1gtk_1image_1set_1from_1icon_1name__J_3BI_FUNC, -#endif _1gtk_1image_1set_1from_1pixbuf_FUNC, _1gtk_1image_1set_1pixel_1size_FUNC, _1gtk_1init_1check___FUNC, @@ -636,16 +556,8 @@ typedef enum { _1gtk_1label_1set_1justify_FUNC, _1gtk_1label_1set_1line_1wrap_FUNC, _1gtk_1label_1set_1line_1wrap_1mode_FUNC, -#ifndef JNI64 - _1gtk_1label_1set_1text__II_FUNC, -#else _1gtk_1label_1set_1text__JJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1label_1set_1text__I_3B_FUNC, -#else _1gtk_1label_1set_1text__J_3B_FUNC, -#endif _1gtk_1label_1set_1text_1with_1mnemonic_FUNC, _1gtk_1label_1set_1xalign_FUNC, _1gtk_1label_1set_1yalign_FUNC, @@ -654,31 +566,11 @@ typedef enum { _1gtk_1list_1store_1insert_FUNC, _1gtk_1list_1store_1newv_FUNC, _1gtk_1list_1store_1remove_FUNC, -#ifndef JNI64 - _1gtk_1list_1store_1set__IIIII_FUNC, -#else _1gtk_1list_1store_1set__JJIII_FUNC, -#endif -#ifndef JNI64 - _1gtk_1list_1store_1set__IIIJI_FUNC, -#else _1gtk_1list_1store_1set__JJIJI_FUNC, -#endif -#ifndef JNI64 - _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC, -#else _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC, -#endif -#ifndef JNI64 - _1gtk_1list_1store_1set__IIIZI_FUNC, -#else _1gtk_1list_1store_1set__JJIZI_FUNC, -#endif -#ifndef JNI64 - _1gtk_1list_1store_1set__III_3BI_FUNC, -#else _1gtk_1list_1store_1set__JJI_3BI_FUNC, -#endif _1gtk_1main_FUNC, _1gtk_1main_1do_1event_FUNC, _1gtk_1menu_1bar_1new_FUNC, @@ -843,48 +735,14 @@ typedef enum { _1gtk_1style_1context_1add_1provider_FUNC, _1gtk_1style_1context_1add_1provider_1for_1display_FUNC, _1gtk_1style_1context_1add_1provider_1for_1screen_FUNC, -#ifndef JNI64 - _1gtk_1style_1context_1get__II_3B_3II_FUNC, -#else _1gtk_1style_1context_1get__JI_3B_3JJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1style_1context_1get__I_3B_3II_FUNC, -#else _1gtk_1style_1context_1get__J_3B_3JJ_FUNC, -#endif - _1gtk_1style_1context_1get_1background_1color_FUNC, -#ifndef JNI64 - _1gtk_1style_1context_1get_1border__IILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#else _1gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#endif -#ifndef JNI64 - _1gtk_1style_1context_1get_1border__ILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#else _1gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#endif -#ifndef JNI64 - _1gtk_1style_1context_1get_1color__IILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC, -#else _1gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC, -#endif -#ifndef JNI64 - _1gtk_1style_1context_1get_1color__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC, -#else _1gtk_1style_1context_1get_1color__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC, -#endif - _1gtk_1style_1context_1get_1font_FUNC, -#ifndef JNI64 - _1gtk_1style_1context_1get_1padding__IILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#else _1gtk_1style_1context_1get_1padding__JILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#endif -#ifndef JNI64 - _1gtk_1style_1context_1get_1padding__ILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#else _1gtk_1style_1context_1get_1padding__JLorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC, -#endif _1gtk_1style_1context_1invalidate_FUNC, _1gtk_1style_1context_1remove_1class_FUNC, _1gtk_1style_1context_1restore_FUNC, @@ -907,16 +767,8 @@ typedef enum { _1gtk_1text_1buffer_1get_1selection_1bound_FUNC, _1gtk_1text_1buffer_1get_1selection_1bounds_FUNC, _1gtk_1text_1buffer_1get_1text_FUNC, -#ifndef JNI64 - _1gtk_1text_1buffer_1insert__II_3BI_FUNC, -#else _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC, -#endif -#ifndef JNI64 - _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC, -#else _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC, -#endif _1gtk_1text_1buffer_1paste_1clipboard_FUNC, _1gtk_1text_1buffer_1place_1cursor_FUNC, _1gtk_1text_1buffer_1select_1range_FUNC, @@ -962,16 +814,8 @@ typedef enum { _1gtk_1toolbar_1set_1icon_1size_FUNC, _1gtk_1toolbar_1set_1show_1arrow_FUNC, _1gtk_1toolbar_1set_1style_FUNC, -#ifndef JNI64 - _1gtk_1tree_1model_1get__III_3II_FUNC, -#else _1gtk_1tree_1model_1get__JJI_3II_FUNC, -#endif -#ifndef JNI64 - _1gtk_1tree_1model_1get__III_3JI_FUNC, -#else _1gtk_1tree_1model_1get__JJI_3JI_FUNC, -#endif _1gtk_1tree_1model_1get_1iter_FUNC, _1gtk_1tree_1model_1get_1iter_1first_FUNC, _1gtk_1tree_1model_1get_1n_1columns_FUNC, @@ -987,11 +831,7 @@ typedef enum { _1gtk_1tree_1path_1get_1depth_FUNC, _1gtk_1tree_1path_1get_1indices_FUNC, _1gtk_1tree_1path_1new_FUNC, -#ifndef JNI64 - _1gtk_1tree_1path_1new_1from_1string__I_FUNC, -#else _1gtk_1tree_1path_1new_1from_1string__J_FUNC, -#endif _1gtk_1tree_1path_1new_1from_1string___3B_FUNC, _1gtk_1tree_1path_1next_FUNC, _1gtk_1tree_1path_1prev_FUNC, @@ -1013,31 +853,11 @@ typedef enum { _1gtk_1tree_1store_1insert_FUNC, _1gtk_1tree_1store_1newv_FUNC, _1gtk_1tree_1store_1remove_FUNC, -#ifndef JNI64 - _1gtk_1tree_1store_1set__IIIII_FUNC, -#else _1gtk_1tree_1store_1set__JJIII_FUNC, -#endif -#ifndef JNI64 - _1gtk_1tree_1store_1set__IIIJI_FUNC, -#else _1gtk_1tree_1store_1set__JJIJI_FUNC, -#endif -#ifndef JNI64 - _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC, -#else _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC, -#endif -#ifndef JNI64 - _1gtk_1tree_1store_1set__IIIZI_FUNC, -#else _1gtk_1tree_1store_1set__JJIZI_FUNC, -#endif -#ifndef JNI64 - _1gtk_1tree_1store_1set__III_3BI_FUNC, -#else _1gtk_1tree_1store_1set__JJI_3BI_FUNC, -#endif _1gtk_1tree_1view_1collapse_1row_FUNC, _1gtk_1tree_1view_1column_1add_1attribute_FUNC, _1gtk_1tree_1view_1column_1cell_1get_1position_FUNC, @@ -1100,16 +920,8 @@ typedef enum { _1gtk_1widget_1add_1events_FUNC, _1gtk_1widget_1child_1focus_FUNC, _1gtk_1widget_1class_1get_1css_1name_FUNC, -#ifndef JNI64 - _1gtk_1widget_1create_1pango_1layout__II_FUNC, -#else _1gtk_1widget_1create_1pango_1layout__JJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC, -#else _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC, -#endif _1gtk_1widget_1destroy_FUNC, _1gtk_1widget_1draw_FUNC, _1gtk_1widget_1event_FUNC, @@ -1196,27 +1008,11 @@ typedef enum { _1gtk_1widget_1set_1visible_FUNC, _1gtk_1widget_1shape_1combine_1region_FUNC, _1gtk_1widget_1show_FUNC, -#ifndef JNI64 - _1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2_FUNC, -#else _1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2_FUNC, -#endif -#ifndef JNI64 - _1gtk_1widget_1size_1allocate__ILorg_eclipse_swt_internal_gtk_GtkAllocation_2I_FUNC, -#else _1gtk_1widget_1size_1allocate__JLorg_eclipse_swt_internal_gtk_GtkAllocation_2I_FUNC, -#endif _1gtk_1widget_1snapshot_1child_FUNC, -#ifndef JNI64 - _1gtk_1widget_1style_1get__I_3B_3II_FUNC, -#else _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC, -#endif -#ifndef JNI64 - _1gtk_1widget_1style_1get__I_3B_3JI_FUNC, -#else _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC, -#endif _1gtk_1widget_1translate_1coordinates_FUNC, _1gtk_1window_1activate_1default_FUNC, _1gtk_1window_1add_1accel_1group_FUNC, @@ -1292,16 +1088,8 @@ extern char* OS_nativeFunctionNames[]; #endif typedef enum { -#ifndef JNI64 - Call__IIII_FUNC, -#else Call__JJII_FUNC, -#endif -#ifndef JNI64 - Call__IIIJ_FUNC, -#else Call__JJIJ_FUNC, -#endif GDK_1WINDOWING_1WAYLAND_FUNC, GDK_1WINDOWING_1X11_FUNC, GInterfaceInfo_1sizeof_FUNC, @@ -1360,21 +1148,9 @@ typedef enum { _1XSynchronize_FUNC, _1access_FUNC, _1cachejvmptr_FUNC, -#ifndef JNI64 - _1call__IIIII_FUNC, -#else _1call__JJJJJ_FUNC, -#endif -#ifndef JNI64 - _1call__IIIIIII_FUNC, -#else _1call__JJJJJJJ_FUNC, -#endif -#ifndef JNI64 - _1call__IIIIIIII_FUNC, -#else _1call__JJJJJJJJ_FUNC, -#endif _1dlopen_FUNC, _1g_1app_1info_1create_1from_1commandline_FUNC, _1g_1app_1info_1get_1all_FUNC, @@ -1449,51 +1225,19 @@ typedef enum { _1g_1main_1context_1release_FUNC, _1g_1malloc_FUNC, _1g_1object_1class_1find_1property_FUNC, -#ifndef JNI64 - _1g_1object_1get__I_3B_3II_FUNC, -#else _1g_1object_1get__J_3B_3IJ_FUNC, -#endif -#ifndef JNI64 - _1g_1object_1get__I_3B_3JI_FUNC, -#else _1g_1object_1get__J_3B_3JJ_FUNC, -#endif _1g_1object_1get_1qdata_FUNC, _1g_1object_1new_FUNC, _1g_1object_1notify_FUNC, _1g_1object_1ref_FUNC, _1g_1object_1ref_1sink_FUNC, -#ifndef JNI64 - _1g_1object_1set__I_3BFI_FUNC, -#else _1g_1object_1set__J_3BFJ_FUNC, -#endif -#ifndef JNI64 - _1g_1object_1set__I_3BII_FUNC, -#else _1g_1object_1set__J_3BIJ_FUNC, -#endif -#ifndef JNI64 - _1g_1object_1set__I_3BJI_FUNC, -#else _1g_1object_1set__J_3BJJ_FUNC, -#endif -#ifndef JNI64 - _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC, -#else _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC, -#endif -#ifndef JNI64 - _1g_1object_1set__I_3BZI_FUNC, -#else _1g_1object_1set__J_3BZJ_FUNC, -#endif -#ifndef JNI64 - _1g_1object_1set__I_3B_3BI_FUNC, -#else _1g_1object_1set__J_3B_3BJ_FUNC, -#endif _1g_1object_1set_1qdata_FUNC, _1g_1object_1unref_FUNC, _1g_1quark_1from_1string_FUNC, @@ -1502,31 +1246,11 @@ typedef enum { _1g_1signal_1connect_FUNC, _1g_1signal_1connect_1closure_FUNC, _1g_1signal_1connect_1closure_1by_1id_FUNC, -#ifndef JNI64 - _1g_1signal_1emit_1by_1name__I_3B_FUNC, -#else _1g_1signal_1emit_1by_1name__J_3B_FUNC, -#endif -#ifndef JNI64 - _1g_1signal_1emit_1by_1name__I_3BI_FUNC, -#else _1g_1signal_1emit_1by_1name__J_3BJ_FUNC, -#endif -#ifndef JNI64 - _1g_1signal_1emit_1by_1name__I_3BII_FUNC, -#else _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC, -#endif -#ifndef JNI64 - _1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC, -#else _1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC, -#endif -#ifndef JNI64 - _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC, -#else _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC, -#endif _1g_1signal_1handler_1disconnect_FUNC, _1g_1signal_1handler_1find_FUNC, _1g_1signal_1handlers_1block_1matched_FUNC, @@ -1564,12 +1288,12 @@ typedef enum { _1g_1utf8_1pointer_1to_1offset_FUNC, _1g_1utf8_1strlen_FUNC, #ifndef JNI64 - _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC, + _1g_1utf8_1to_1utf16__JJ_3I_3I_3I_FUNC, #else _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC, #endif #ifndef JNI64 - _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC, + _1g_1utf8_1to_1utf16___3BJ_3I_3I_3I_FUNC, #else _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC, #endif @@ -1720,181 +1444,41 @@ typedef enum { imContextLast_FUNC, imContextNewProc_1CALLBACK_FUNC, localeconv_1decimal_1point_FUNC, -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC, -#else memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC, -#else memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC, -#endif pangoFontFaceNewProc_1CALLBACK_FUNC, pangoFontFamilyNewProc_1CALLBACK_FUNC, pangoLayoutNewProc_1CALLBACK_FUNC, diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c index 06b16ba1d3..0ded92b233 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c @@ -32,27 +32,27 @@ void cacheGInterfaceInfoFields(JNIEnv *env, jobject lpObject) { if (GInterfaceInfoFc.cached) return; GInterfaceInfoFc.clazz = (*env)->GetObjectClass(env, lpObject); - GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", I_J); - GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", I_J); - GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", I_J); + GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", "J"); + GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", "J"); + GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", "J"); GInterfaceInfoFc.cached = 1; } GInterfaceInfo *getGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct) { if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject); - lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_init); - lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_finalize); - lpStruct->interface_data = (gpointer)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_data); + lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_init); + lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_finalize); + lpStruct->interface_data = (gpointer)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_data); return lpStruct; } void setGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct) { if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_init, (jintLong)lpStruct->interface_init); - (*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jintLong)lpStruct->interface_finalize); - (*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_data, (jintLong)lpStruct->interface_data); + (*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_init, (jlong)lpStruct->interface_init); + (*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jlong)lpStruct->interface_finalize); + (*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_data, (jlong)lpStruct->interface_data); } #endif @@ -69,39 +69,39 @@ void cacheGObjectClassFields(JNIEnv *env, jobject lpObject) { if (GObjectClassFc.cached) return; GObjectClassFc.clazz = (*env)->GetObjectClass(env, lpObject); - GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", I_J); - GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", I_J); - GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", I_J); - GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", I_J); - GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", I_J); - GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", I_J); - GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", I_J); + GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", "J"); + GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", "J"); + GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", "J"); + GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", "J"); + GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", "J"); + GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", "J"); + GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", "J"); GObjectClassFc.cached = 1; } GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct) { if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject); - lpStruct->constructor = (GObject *(*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.constructor); - lpStruct->set_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.set_property); - lpStruct->get_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.get_property); - lpStruct->dispose = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispose); - lpStruct->finalize = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.finalize); - lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed); - lpStruct->notify = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.notify); + lpStruct->constructor = (GObject *(*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.constructor); + lpStruct->set_property = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.set_property); + lpStruct->get_property = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.get_property); + lpStruct->dispose = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.dispose); + lpStruct->finalize = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.finalize); + lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed); + lpStruct->notify = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.notify); return lpStruct; } void setGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct) { if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, GObjectClassFc.constructor, (jintLong)lpStruct->constructor); - (*env)->SetIntLongField(env, lpObject, GObjectClassFc.set_property, (jintLong)lpStruct->set_property); - (*env)->SetIntLongField(env, lpObject, GObjectClassFc.get_property, (jintLong)lpStruct->get_property); - (*env)->SetIntLongField(env, lpObject, GObjectClassFc.dispose, (jintLong)lpStruct->dispose); - (*env)->SetIntLongField(env, lpObject, GObjectClassFc.finalize, (jintLong)lpStruct->finalize); - (*env)->SetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jintLong)lpStruct->dispatch_properties_changed); - (*env)->SetIntLongField(env, lpObject, GObjectClassFc.notify, (jintLong)lpStruct->notify); + (*env)->SetLongField(env, lpObject, GObjectClassFc.constructor, (jlong)lpStruct->constructor); + (*env)->SetLongField(env, lpObject, GObjectClassFc.set_property, (jlong)lpStruct->set_property); + (*env)->SetLongField(env, lpObject, GObjectClassFc.get_property, (jlong)lpStruct->get_property); + (*env)->SetLongField(env, lpObject, GObjectClassFc.dispose, (jlong)lpStruct->dispose); + (*env)->SetLongField(env, lpObject, GObjectClassFc.finalize, (jlong)lpStruct->finalize); + (*env)->SetLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jlong)lpStruct->dispatch_properties_changed); + (*env)->SetLongField(env, lpObject, GObjectClassFc.notify, (jlong)lpStruct->notify); } #endif @@ -119,15 +119,15 @@ void cacheGTypeInfoFields(JNIEnv *env, jobject lpObject) if (GTypeInfoFc.cached) return; GTypeInfoFc.clazz = (*env)->GetObjectClass(env, lpObject); GTypeInfoFc.class_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_size", "S"); - GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", I_J); - GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", I_J); - GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", I_J); - GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", I_J); - GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", I_J); + GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", "J"); + GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", "J"); + GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", "J"); + GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", "J"); + GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", "J"); GTypeInfoFc.instance_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_size", "S"); GTypeInfoFc.n_preallocs = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "n_preallocs", "S"); - GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", I_J); - GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", I_J); + GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", "J"); + GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", "J"); GTypeInfoFc.cached = 1; } @@ -135,15 +135,15 @@ GTypeInfo *getGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct { if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject); lpStruct->class_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.class_size); - lpStruct->base_init = (GBaseInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.base_init); - lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.base_finalize); - lpStruct->class_init = (GClassInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_init); - lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_finalize); - lpStruct->class_data = (gconstpointer)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_data); + lpStruct->base_init = (GBaseInitFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.base_init); + lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.base_finalize); + lpStruct->class_init = (GClassInitFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.class_init); + lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.class_finalize); + lpStruct->class_data = (gconstpointer)(*env)->GetLongField(env, lpObject, GTypeInfoFc.class_data); lpStruct->instance_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.instance_size); lpStruct->n_preallocs = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.n_preallocs); - lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.instance_init); - lpStruct->value_table = (GTypeValueTable *)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.value_table); + lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.instance_init); + lpStruct->value_table = (GTypeValueTable *)(*env)->GetLongField(env, lpObject, GTypeInfoFc.value_table); return lpStruct; } @@ -151,15 +151,15 @@ void setGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct) { if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject); (*env)->SetShortField(env, lpObject, GTypeInfoFc.class_size, (jshort)lpStruct->class_size); - (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.base_init, (jintLong)lpStruct->base_init); - (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.base_finalize, (jintLong)lpStruct->base_finalize); - (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_init, (jintLong)lpStruct->class_init); - (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_finalize, (jintLong)lpStruct->class_finalize); - (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_data, (jintLong)lpStruct->class_data); + (*env)->SetLongField(env, lpObject, GTypeInfoFc.base_init, (jlong)lpStruct->base_init); + (*env)->SetLongField(env, lpObject, GTypeInfoFc.base_finalize, (jlong)lpStruct->base_finalize); + (*env)->SetLongField(env, lpObject, GTypeInfoFc.class_init, (jlong)lpStruct->class_init); + (*env)->SetLongField(env, lpObject, GTypeInfoFc.class_finalize, (jlong)lpStruct->class_finalize); + (*env)->SetLongField(env, lpObject, GTypeInfoFc.class_data, (jlong)lpStruct->class_data); (*env)->SetShortField(env, lpObject, GTypeInfoFc.instance_size, (jshort)lpStruct->instance_size); (*env)->SetShortField(env, lpObject, GTypeInfoFc.n_preallocs, (jshort)lpStruct->n_preallocs); - (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.instance_init, (jintLong)lpStruct->instance_init); - (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.value_table, (jintLong)lpStruct->value_table); + (*env)->SetLongField(env, lpObject, GTypeInfoFc.instance_init, (jlong)lpStruct->instance_init); + (*env)->SetLongField(env, lpObject, GTypeInfoFc.value_table, (jlong)lpStruct->value_table); } #endif @@ -177,7 +177,7 @@ void cacheGTypeQueryFields(JNIEnv *env, jobject lpObject) if (GTypeQueryFc.cached) return; GTypeQueryFc.clazz = (*env)->GetObjectClass(env, lpObject); GTypeQueryFc.type = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type", "I"); - GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", I_J); + GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", "J"); GTypeQueryFc.class_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "class_size", "I"); GTypeQueryFc.instance_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "instance_size", "I"); GTypeQueryFc.cached = 1; @@ -187,7 +187,7 @@ GTypeQuery *getGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStr { if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject); lpStruct->type = (GType)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type); - lpStruct->type_name = (const gchar *)(*env)->GetIntLongField(env, lpObject, GTypeQueryFc.type_name); + lpStruct->type_name = (const gchar *)(*env)->GetLongField(env, lpObject, GTypeQueryFc.type_name); lpStruct->class_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.class_size); lpStruct->instance_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.instance_size); return lpStruct; @@ -197,7 +197,7 @@ void setGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStruct) { if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject); (*env)->SetIntField(env, lpObject, GTypeQueryFc.type, (jint)lpStruct->type); - (*env)->SetIntLongField(env, lpObject, GTypeQueryFc.type_name, (jintLong)lpStruct->type_name); + (*env)->SetLongField(env, lpObject, GTypeQueryFc.type_name, (jlong)lpStruct->type_name); (*env)->SetIntField(env, lpObject, GTypeQueryFc.class_size, (jint)lpStruct->class_size); (*env)->SetIntField(env, lpObject, GTypeQueryFc.instance_size, (jint)lpStruct->instance_size); } @@ -248,7 +248,7 @@ void cacheGdkEventAnyFields(JNIEnv *env, jobject lpObject) if (GdkEventAnyFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventAnyFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", I_J); + GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", "J"); GdkEventAnyFc.send_event = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "send_event", "B"); GdkEventAnyFc.cached = 1; } @@ -257,7 +257,7 @@ GdkEventAny *getGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lp { if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventAnyFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventAnyFc.window); lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventAnyFc.send_event); return lpStruct; } @@ -266,7 +266,7 @@ void setGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lpStruct) { if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventAnyFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventAnyFc.window, (jlong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventAnyFc.send_event, (jbyte)lpStruct->send_event); } #endif @@ -285,15 +285,15 @@ void cacheGdkEventButtonFields(JNIEnv *env, jobject lpObject) if (GdkEventButtonFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventButtonFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", I_J); + GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", "J"); GdkEventButtonFc.send_event = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "send_event", "B"); GdkEventButtonFc.time = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "time", "I"); GdkEventButtonFc.x = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x", "D"); GdkEventButtonFc.y = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y", "D"); - GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", I_J); + GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", "J"); GdkEventButtonFc.state = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "state", "I"); GdkEventButtonFc.button = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "button", "I"); - GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", I_J); + GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", "J"); GdkEventButtonFc.x_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x_root", "D"); GdkEventButtonFc.y_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y_root", "D"); GdkEventButtonFc.cached = 1; @@ -303,15 +303,15 @@ GdkEventButton *getGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventB { if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventButtonFc.window); lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventButtonFc.send_event); lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.time); lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x); lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y); - lpStruct->axes = (gdouble *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.axes); + lpStruct->axes = (gdouble *)(*env)->GetLongField(env, lpObject, GdkEventButtonFc.axes); lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.state); lpStruct->button = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.button); - lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.device); + lpStruct->device = (GdkDevice *)(*env)->GetLongField(env, lpObject, GdkEventButtonFc.device); lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x_root); lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y_root); return lpStruct; @@ -321,15 +321,15 @@ void setGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventButton *lpSt { if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventButtonFc.window, (jlong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventButtonFc.send_event, (jbyte)lpStruct->send_event); (*env)->SetIntField(env, lpObject, GdkEventButtonFc.time, (jint)lpStruct->time); (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x, (jdouble)lpStruct->x); (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y, (jdouble)lpStruct->y); - (*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.axes, (jintLong)lpStruct->axes); + (*env)->SetLongField(env, lpObject, GdkEventButtonFc.axes, (jlong)lpStruct->axes); (*env)->SetIntField(env, lpObject, GdkEventButtonFc.state, (jint)lpStruct->state); (*env)->SetIntField(env, lpObject, GdkEventButtonFc.button, (jint)lpStruct->button); - (*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.device, (jintLong)lpStruct->device); + (*env)->SetLongField(env, lpObject, GdkEventButtonFc.device, (jlong)lpStruct->device); (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x_root, (jdouble)lpStruct->x_root); (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y_root, (jdouble)lpStruct->y_root); } @@ -349,9 +349,9 @@ void cacheGdkEventCrossingFields(JNIEnv *env, jobject lpObject) if (GdkEventCrossingFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventCrossingFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", I_J); + GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", "J"); GdkEventCrossingFc.send_event = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "send_event", "B"); - GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", I_J); + GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", "J"); GdkEventCrossingFc.time = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "time", "I"); GdkEventCrossingFc.x = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "x", "D"); GdkEventCrossingFc.y = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "y", "D"); @@ -368,9 +368,9 @@ GdkEventCrossing *getGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEv { if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventCrossingFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventCrossingFc.window); lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventCrossingFc.send_event); - lpStruct->subwindow = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventCrossingFc.subwindow); + lpStruct->subwindow = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventCrossingFc.subwindow); lpStruct->time = (*env)->GetIntField(env, lpObject, GdkEventCrossingFc.time); lpStruct->x = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.x); lpStruct->y = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.y); @@ -387,9 +387,9 @@ void setGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEventCrossing * { if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventCrossingFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventCrossingFc.window, (jlong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventCrossingFc.send_event, (jbyte)lpStruct->send_event); - (*env)->SetIntLongField(env, lpObject, GdkEventCrossingFc.subwindow, (jintLong)lpStruct->subwindow); + (*env)->SetLongField(env, lpObject, GdkEventCrossingFc.subwindow, (jlong)lpStruct->subwindow); (*env)->SetIntField(env, lpObject, GdkEventCrossingFc.time, (jint)lpStruct->time); (*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.x, (jdouble)lpStruct->x); (*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.y, (jdouble)lpStruct->y); @@ -497,13 +497,13 @@ if (GdkEventExposeFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventExposeFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", I_J); + GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", "J"); GdkEventExposeFc.send_event = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "send_event", "B"); GdkEventExposeFc.area_x = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_x", "I"); GdkEventExposeFc.area_y = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_y", "I"); GdkEventExposeFc.area_width = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_width", "I"); GdkEventExposeFc.area_height = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_height", "I"); - GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", I_J); + GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", "J"); GdkEventExposeFc.count = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "count", "I"); GdkEventExposeFc.cached = 1; } @@ -411,13 +411,13 @@ { if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventExposeFc.window); lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventExposeFc.send_event); lpStruct->area.x = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_x); lpStruct->area.y = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_y); lpStruct->area.width = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_width); lpStruct->area.height = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_height); - lpStruct->region = (void *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.region); + lpStruct->region = (void *)(*env)->GetLongField(env, lpObject, GdkEventExposeFc.region); lpStruct->count = (gint)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.count); return lpStruct; } @@ -426,13 +426,13 @@ { if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventExposeFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventExposeFc.window, (jintLong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventExposeFc.send_event, (jbyte)lpStruct->send_event); (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_x, (jint)lpStruct->area.x); (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_y, (jint)lpStruct->area.y); (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_width, (jint)lpStruct->area.width); (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_height, (jint)lpStruct->area.height); - (*env)->SetIntLongField(env, lpObject, GdkEventExposeFc.region, (jintLong)lpStruct->region); + (*env)->SetLongField(env, lpObject, GdkEventExposeFc.region, (jintLong)lpStruct->region); (*env)->SetIntField(env, lpObject, GdkEventExposeFc.count, (jint)lpStruct->count); } #endif @@ -440,7 +440,7 @@ void cacheGdkEventFocusFields(JNIEnv *env, jobject lpObject) if (GdkEventFocusFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventFocusFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", I_J); + GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", "J"); GdkEventFocusFc.send_event = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "send_event", "B"); GdkEventFocusFc.in = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "in", "S"); GdkEventFocusFc.cached = 1; @@ -447,7 +447,7 @@ GdkEventFocus *getGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFoc { if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventFocusFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventFocusFc.window); lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventFocusFc.send_event); lpStruct->in = (gint16)(*env)->GetShortField(env, lpObject, GdkEventFocusFc.in); return lpStruct; @@ -454,7 +454,7 @@ void setGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFocus *lpStru { if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventFocusFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventFocusFc.window, (jlong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventFocusFc.send_event, (jbyte)lpStruct->send_event); (*env)->SetShortField(env, lpObject, GdkEventFocusFc.in, (jshort)lpStruct->in); } @@ -466,13 +466,13 @@ void cacheGdkEventKeyFields(JNIEnv *env, jobject lpObject) if (GdkEventKeyFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventKeyFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", I_J); + GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", "J"); GdkEventKeyFc.send_event = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "send_event", "B"); GdkEventKeyFc.time = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "time", "I"); GdkEventKeyFc.state = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "state", "I"); GdkEventKeyFc.keyval = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "keyval", "I"); GdkEventKeyFc.length = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "length", "I"); - GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", I_J); + GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", "J"); GdkEventKeyFc.hardware_keycode = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "hardware_keycode", "S"); GdkEventKeyFc.group = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "group", "B"); GdkEventKeyFc.is_modifier = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "is_modifier", "I"); @@ -473,13 +473,13 @@ GdkEventKey *getGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lp { if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventKeyFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventKeyFc.window); lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.send_event); lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.time); lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.state); lpStruct->keyval = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.keyval); lpStruct->length = (gint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.length); - lpStruct->string = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkEventKeyFc.string); + lpStruct->string = (gchar *)(*env)->GetLongField(env, lpObject, GdkEventKeyFc.string); lpStruct->hardware_keycode = (guint16)(*env)->GetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode); lpStruct->group = (guint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.group); lpStruct->is_modifier = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.is_modifier); @@ -490,13 +490,13 @@ void setGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lpStruct) { if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventKeyFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventKeyFc.window, (jlong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventKeyFc.send_event, (jbyte)lpStruct->send_event); (*env)->SetIntField(env, lpObject, GdkEventKeyFc.time, (jint)lpStruct->time); (*env)->SetIntField(env, lpObject, GdkEventKeyFc.state, (jint)lpStruct->state); (*env)->SetIntField(env, lpObject, GdkEventKeyFc.keyval, (jint)lpStruct->keyval); (*env)->SetIntField(env, lpObject, GdkEventKeyFc.length, (jint)lpStruct->length); - (*env)->SetIntLongField(env, lpObject, GdkEventKeyFc.string, (jintLong)lpStruct->string); + (*env)->SetLongField(env, lpObject, GdkEventKeyFc.string, (jlong)lpStruct->string); (*env)->SetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode, (jshort)lpStruct->hardware_keycode); (*env)->SetByteField(env, lpObject, GdkEventKeyFc.group, (jbyte)lpStruct->group); (*env)->SetIntField(env, lpObject, GdkEventKeyFc.is_modifier, (jint)lpStruct->is_modifier); @@ -517,15 +517,15 @@ void cacheGdkEventMotionFields(JNIEnv *env, jobject lpObject) if (GdkEventMotionFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventMotionFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", I_J); + GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", "J"); GdkEventMotionFc.send_event = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "send_event", "B"); GdkEventMotionFc.time = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "time", "I"); GdkEventMotionFc.x = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x", "D"); GdkEventMotionFc.y = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y", "D"); - GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", I_J); + GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", "J"); GdkEventMotionFc.state = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "state", "I"); GdkEventMotionFc.is_hint = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "is_hint", "S"); - GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", I_J); + GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", "J"); GdkEventMotionFc.x_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x_root", "D"); GdkEventMotionFc.y_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y_root", "D"); GdkEventMotionFc.cached = 1; @@ -535,15 +535,15 @@ GdkEventMotion *getGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventM { if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventMotionFc.window); lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventMotionFc.send_event); lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.time); lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x); lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y); - lpStruct->axes = (gdouble *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.axes); + lpStruct->axes = (gdouble *)(*env)->GetLongField(env, lpObject, GdkEventMotionFc.axes); lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.state); lpStruct->is_hint = (gint16)(*env)->GetShortField(env, lpObject, GdkEventMotionFc.is_hint); - lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.device); + lpStruct->device = (GdkDevice *)(*env)->GetLongField(env, lpObject, GdkEventMotionFc.device); lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x_root); lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y_root); return lpStruct; @@ -553,15 +553,15 @@ void setGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventMotion *lpSt { if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventMotionFc.window, (jlong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventMotionFc.send_event, (jbyte)lpStruct->send_event); (*env)->SetIntField(env, lpObject, GdkEventMotionFc.time, (jint)lpStruct->time); (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x, (jdouble)lpStruct->x); (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y, (jdouble)lpStruct->y); - (*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.axes, (jintLong)lpStruct->axes); + (*env)->SetLongField(env, lpObject, GdkEventMotionFc.axes, (jlong)lpStruct->axes); (*env)->SetIntField(env, lpObject, GdkEventMotionFc.state, (jint)lpStruct->state); (*env)->SetShortField(env, lpObject, GdkEventMotionFc.is_hint, (jshort)lpStruct->is_hint); - (*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.device, (jintLong)lpStruct->device); + (*env)->SetLongField(env, lpObject, GdkEventMotionFc.device, (jlong)lpStruct->device); (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x_root, (jdouble)lpStruct->x_root); (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y_root, (jdouble)lpStruct->y_root); } @@ -581,7 +581,7 @@ void cacheGdkEventWindowStateFields(JNIEnv *env, jobject lpObject) if (GdkEventWindowStateFc.cached) return; cacheGdkEventFields(env, lpObject); GdkEventWindowStateFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", I_J); + GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", "J"); GdkEventWindowStateFc.send_event = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "send_event", "B"); GdkEventWindowStateFc.changed_mask = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "changed_mask", "I"); GdkEventWindowStateFc.new_window_state = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "new_window_state", "I"); @@ -592,7 +592,7 @@ GdkEventWindowState *getGdkEventWindowStateFields(JNIEnv *env, jobject lpObject, { if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject); getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventWindowStateFc.window); + lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventWindowStateFc.window); lpStruct->send_event = (*env)->GetByteField(env, lpObject, GdkEventWindowStateFc.send_event); lpStruct->changed_mask = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask); lpStruct->new_window_state = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state); @@ -603,7 +603,7 @@ void setGdkEventWindowStateFields(JNIEnv *env, jobject lpObject, GdkEventWindowS { if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject); setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventWindowStateFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, GdkEventWindowStateFc.window, (jlong)lpStruct->window); (*env)->SetByteField(env, lpObject, GdkEventWindowStateFc.send_event, (jbyte)lpStruct->send_event); (*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask, (jint)lpStruct->changed_mask); (*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state, (jint)lpStruct->new_window_state); @@ -801,18 +801,18 @@ void cacheGdkWindowAttrFields(JNIEnv *env, jobject lpObject) { if (GdkWindowAttrFc.cached) return; GdkWindowAttrFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", I_J); + GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", "J"); GdkWindowAttrFc.event_mask = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "event_mask", "I"); GdkWindowAttrFc.x = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "x", "I"); GdkWindowAttrFc.y = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "y", "I"); GdkWindowAttrFc.width = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "width", "I"); GdkWindowAttrFc.height = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "height", "I"); GdkWindowAttrFc.wclass = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wclass", "I"); - GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", I_J); + GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", "J"); GdkWindowAttrFc.window_type = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "window_type", "I"); - GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", I_J); - GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", I_J); - GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", I_J); + GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", "J"); + GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", "J"); + GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", "J"); GdkWindowAttrFc.override_redirect = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "override_redirect", "Z"); GdkWindowAttrFc.cached = 1; } @@ -820,18 +820,18 @@ void cacheGdkWindowAttrFields(JNIEnv *env, jobject lpObject) GdkWindowAttr *getGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct) { if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject); - lpStruct->title = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.title); + lpStruct->title = (gchar *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.title); lpStruct->event_mask = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.event_mask); lpStruct->x = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.x); lpStruct->y = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.y); lpStruct->width = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.width); lpStruct->height = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.height); lpStruct->wclass = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wclass); - lpStruct->visual = (GdkVisual *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.visual); + lpStruct->visual = (GdkVisual *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.visual); lpStruct->window_type = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.window_type); - lpStruct->cursor = (GdkCursor *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.cursor); - lpStruct->wmclass_name = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_name); - lpStruct->wmclass_class = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_class); + lpStruct->cursor = (GdkCursor *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.cursor); + lpStruct->wmclass_name = (gchar *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.wmclass_name); + lpStruct->wmclass_class = (gchar *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.wmclass_class); lpStruct->override_redirect = (*env)->GetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect); return lpStruct; } @@ -839,18 +839,18 @@ GdkWindowAttr *getGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAt void setGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct) { if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.title, (jintLong)lpStruct->title); + (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.title, (jlong)lpStruct->title); (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.event_mask, (jint)lpStruct->event_mask); (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.x, (jint)lpStruct->x); (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.y, (jint)lpStruct->y); (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.width, (jint)lpStruct->width); (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.height, (jint)lpStruct->height); (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wclass, (jint)lpStruct->wclass); - (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.visual, (jintLong)lpStruct->visual); + (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.visual, (jlong)lpStruct->visual); (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.window_type, (jint)lpStruct->window_type); - (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.cursor, (jintLong)lpStruct->cursor); - (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jintLong)lpStruct->wmclass_name); - (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jintLong)lpStruct->wmclass_class); + (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.cursor, (jlong)lpStruct->cursor); + (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jlong)lpStruct->wmclass_name); + (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jlong)lpStruct->wmclass_class); (*env)->SetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect, (jboolean)lpStruct->override_redirect); } #endif @@ -948,9 +948,9 @@ void cacheGtkCellRendererClassFields(JNIEnv *env, jobject lpObject) { if (GtkCellRendererClassFc.cached) return; GtkCellRendererClassFc.clazz = (*env)->GetObjectClass(env, lpObject); - GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", I_J); - GtkCellRendererClassFc.snapshot = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "snapshot", I_J); - GtkCellRendererClassFc.get_preferred_width = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_preferred_width", I_J); + GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", "J"); + GtkCellRendererClassFc.snapshot = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "snapshot", "J"); + GtkCellRendererClassFc.get_preferred_width = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_preferred_width", "J"); GtkCellRendererClassFc.cached = 1; } @@ -958,12 +958,12 @@ GtkCellRendererClass *getGtkCellRendererClassFields(JNIEnv *env, jobject lpObjec { if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject); #ifndef GTK4 - lpStruct->render = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.render); + lpStruct->render = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.render); #endif #ifdef GTK4 - lpStruct->snapshot = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.snapshot); + lpStruct->snapshot = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.snapshot); #endif - lpStruct->get_preferred_width = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width); + lpStruct->get_preferred_width = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width); return lpStruct; } @@ -971,12 +971,12 @@ void setGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendere { if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject); #ifndef GTK4 - (*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.render, (jintLong)lpStruct->render); + (*env)->SetLongField(env, lpObject, GtkCellRendererClassFc.render, (jlong)lpStruct->render); #endif #ifdef GTK4 - (*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.snapshot, (jintLong)lpStruct->snapshot); + (*env)->SetLongField(env, lpObject, GtkCellRendererClassFc.snapshot, (jlong)lpStruct->snapshot); #endif - (*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width, (jintLong)lpStruct->get_preferred_width); + (*env)->SetLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width, (jlong)lpStruct->get_preferred_width); } #endif @@ -1027,7 +1027,7 @@ void cacheGtkTargetEntryFields(JNIEnv *env, jobject lpObject) { if (GtkTargetEntryFc.cached) return; GtkTargetEntryFc.clazz = (*env)->GetObjectClass(env, lpObject); - GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", I_J); + GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", "J"); GtkTargetEntryFc.flags = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "flags", "I"); GtkTargetEntryFc.info = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "info", "I"); GtkTargetEntryFc.cached = 1; @@ -1036,7 +1036,7 @@ void cacheGtkTargetEntryFields(JNIEnv *env, jobject lpObject) GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct) { if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject); - lpStruct->target = (gchar *)(*env)->GetIntLongField(env, lpObject, GtkTargetEntryFc.target); + lpStruct->target = (gchar *)(*env)->GetLongField(env, lpObject, GtkTargetEntryFc.target); lpStruct->flags = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.flags); lpStruct->info = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.info); return lpStruct; @@ -1045,7 +1045,7 @@ GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTarget void setGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct) { if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, GtkTargetEntryFc.target, (jintLong)lpStruct->target); + (*env)->SetLongField(env, lpObject, GtkTargetEntryFc.target, (jlong)lpStruct->target); (*env)->SetIntField(env, lpObject, GtkTargetEntryFc.flags, (jint)lpStruct->flags); (*env)->SetIntField(env, lpObject, GtkTargetEntryFc.info, (jint)lpStruct->info); } @@ -1065,9 +1065,9 @@ void cacheGtkWidgetClassFields(JNIEnv *env, jobject lpObject) if (GtkWidgetClassFc.cached) return; cacheGObjectClassFields(env, lpObject); GtkWidgetClassFc.clazz = (*env)->GetObjectClass(env, lpObject); - GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", I_J); - GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", I_J); - GtkWidgetClassFc.snapshot = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "snapshot", I_J); + GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", "J"); + GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", "J"); + GtkWidgetClassFc.snapshot = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "snapshot", "J"); GtkWidgetClassFc.cached = 1; } @@ -1075,10 +1075,10 @@ GtkWidgetClass *getGtkWidgetClassFields(JNIEnv *env, jobject lpObject, GtkWidget { if (!GtkWidgetClassFc.cached) cacheGtkWidgetClassFields(env, lpObject); getGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct); - lpStruct->map = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.map); - lpStruct->size_allocate = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate); + lpStruct->map = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.map); + lpStruct->size_allocate = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.size_allocate); #ifdef GTK4 - lpStruct->snapshot = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.snapshot); + lpStruct->snapshot = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.snapshot); #endif return lpStruct; } @@ -1087,10 +1087,10 @@ void setGtkWidgetClassFields(JNIEnv *env, jobject lpObject, GtkWidgetClass *lpSt { if (!GtkWidgetClassFc.cached) cacheGtkWidgetClassFields(env, lpObject); setGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.map, (jintLong)lpStruct->map); - (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate, (jintLong)lpStruct->size_allocate); + (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.map, (jlong)lpStruct->map); + (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.size_allocate, (jlong)lpStruct->size_allocate); #ifdef GTK4 - (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.snapshot, (jintLong)lpStruct->snapshot); + (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.snapshot, (jlong)lpStruct->snapshot); #endif } #endif @@ -1182,7 +1182,7 @@ void cachePangoAttributeFields(JNIEnv *env, jobject lpObject) { if (PangoAttributeFc.cached) return; PangoAttributeFc.clazz = (*env)->GetObjectClass(env, lpObject); - PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", I_J); + PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", "J"); PangoAttributeFc.start_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "start_index", "I"); PangoAttributeFc.end_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "end_index", "I"); PangoAttributeFc.cached = 1; @@ -1191,7 +1191,7 @@ void cachePangoAttributeFields(JNIEnv *env, jobject lpObject) PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct) { if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject); - lpStruct->klass = (const PangoAttrClass *)(*env)->GetIntLongField(env, lpObject, PangoAttributeFc.klass); + lpStruct->klass = (const PangoAttrClass *)(*env)->GetLongField(env, lpObject, PangoAttributeFc.klass); lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.start_index); lpStruct->end_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.end_index); return lpStruct; @@ -1200,7 +1200,7 @@ PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttr void setPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct) { if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, PangoAttributeFc.klass, (jintLong)lpStruct->klass); + (*env)->SetLongField(env, lpObject, PangoAttributeFc.klass, (jlong)lpStruct->klass); (*env)->SetIntField(env, lpObject, PangoAttributeFc.start_index, (jint)lpStruct->start_index); (*env)->SetIntField(env, lpObject, PangoAttributeFc.end_index, (jint)lpStruct->end_index); } @@ -1222,12 +1222,12 @@ void cachePangoItemFields(JNIEnv *env, jobject lpObject) PangoItemFc.offset = (*env)->GetFieldID(env, PangoItemFc.clazz, "offset", "I"); PangoItemFc.length = (*env)->GetFieldID(env, PangoItemFc.clazz, "length", "I"); PangoItemFc.num_chars = (*env)->GetFieldID(env, PangoItemFc.clazz, "num_chars", "I"); - PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", I_J); - PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", I_J); - PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", I_J); + PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", "J"); + PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", "J"); + PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", "J"); PangoItemFc.analysis_level = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_level", "B"); - PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", I_J); - PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", I_J); + PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", "J"); + PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", "J"); PangoItemFc.cached = 1; } @@ -1237,12 +1237,12 @@ PangoItem *getPangoItemFields(JNIEnv *env, jobject lpObject, PangoItem *lpStruct lpStruct->offset = (*env)->GetIntField(env, lpObject, PangoItemFc.offset); lpStruct->length = (*env)->GetIntField(env, lpObject, PangoItemFc.length); lpStruct->num_chars = (*env)->GetIntField(env, lpObject, PangoItemFc.num_chars); - lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_shape_engine); - lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_lang_engine); - lpStruct->analysis.font = (PangoFont *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_font); + lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_shape_engine); + lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_lang_engine); + lpStruct->analysis.font = (PangoFont *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_font); lpStruct->analysis.level = (*env)->GetByteField(env, lpObject, PangoItemFc.analysis_level); - lpStruct->analysis.language = (PangoLanguage *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_language); - lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_extra_attrs); + lpStruct->analysis.language = (PangoLanguage *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_language); + lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_extra_attrs); return lpStruct; } @@ -1252,12 +1252,12 @@ void setPangoItemFields(JNIEnv *env, jobject lpObject, PangoItem *lpStruct) (*env)->SetIntField(env, lpObject, PangoItemFc.offset, (jint)lpStruct->offset); (*env)->SetIntField(env, lpObject, PangoItemFc.length, (jint)lpStruct->length); (*env)->SetIntField(env, lpObject, PangoItemFc.num_chars, (jint)lpStruct->num_chars); - (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_shape_engine, (jintLong)lpStruct->analysis.shape_engine); - (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_lang_engine, (jintLong)lpStruct->analysis.lang_engine); - (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_font, (jintLong)lpStruct->analysis.font); + (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_shape_engine, (jlong)lpStruct->analysis.shape_engine); + (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_lang_engine, (jlong)lpStruct->analysis.lang_engine); + (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_font, (jlong)lpStruct->analysis.font); (*env)->SetByteField(env, lpObject, PangoItemFc.analysis_level, (jbyte)lpStruct->analysis.level); - (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_language, (jintLong)lpStruct->analysis.language); - (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jintLong)lpStruct->analysis.extra_attrs); + (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_language, (jlong)lpStruct->analysis.language); + (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jlong)lpStruct->analysis.extra_attrs); } #endif @@ -1274,30 +1274,30 @@ void cachePangoLayoutLineFields(JNIEnv *env, jobject lpObject) { if (PangoLayoutLineFc.cached) return; PangoLayoutLineFc.clazz = (*env)->GetObjectClass(env, lpObject); - PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", I_J); + PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", "J"); PangoLayoutLineFc.start_index = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "start_index", "I"); PangoLayoutLineFc.length = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "length", "I"); - PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", I_J); + PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", "J"); PangoLayoutLineFc.cached = 1; } PangoLayoutLine *getPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct) { if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject); - lpStruct->layout = (PangoLayout *)(*env)->GetIntLongField(env, lpObject, PangoLayoutLineFc.layout); + lpStruct->layout = (PangoLayout *)(*env)->GetLongField(env, lpObject, PangoLayoutLineFc.layout); lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.start_index); lpStruct->length = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.length); - lpStruct->runs = (GSList *)(*env)->GetIntLongField(env, lpObject, PangoLayoutLineFc.runs); + lpStruct->runs = (GSList *)(*env)->GetLongField(env, lpObject, PangoLayoutLineFc.runs); return lpStruct; } void setPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct) { if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, PangoLayoutLineFc.layout, (jintLong)lpStruct->layout); + (*env)->SetLongField(env, lpObject, PangoLayoutLineFc.layout, (jlong)lpStruct->layout); (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.start_index, (jint)lpStruct->start_index); (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.length, (jint)lpStruct->length); - (*env)->SetIntLongField(env, lpObject, PangoLayoutLineFc.runs, (jintLong)lpStruct->runs); + (*env)->SetLongField(env, lpObject, PangoLayoutLineFc.runs, (jlong)lpStruct->runs); } #endif @@ -1314,24 +1314,24 @@ void cachePangoLayoutRunFields(JNIEnv *env, jobject lpObject) { if (PangoLayoutRunFc.cached) return; PangoLayoutRunFc.clazz = (*env)->GetObjectClass(env, lpObject); - PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", I_J); - PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", I_J); + PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", "J"); + PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", "J"); PangoLayoutRunFc.cached = 1; } PangoLayoutRun *getPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct) { if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject); - lpStruct->item = (PangoItem *)(*env)->GetIntLongField(env, lpObject, PangoLayoutRunFc.item); - lpStruct->glyphs = (PangoGlyphString *)(*env)->GetIntLongField(env, lpObject, PangoLayoutRunFc.glyphs); + lpStruct->item = (PangoItem *)(*env)->GetLongField(env, lpObject, PangoLayoutRunFc.item); + lpStruct->glyphs = (PangoGlyphString *)(*env)->GetLongField(env, lpObject, PangoLayoutRunFc.glyphs); return lpStruct; } void setPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct) { if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, PangoLayoutRunFc.item, (jintLong)lpStruct->item); - (*env)->SetIntLongField(env, lpObject, PangoLayoutRunFc.glyphs, (jintLong)lpStruct->glyphs); + (*env)->SetLongField(env, lpObject, PangoLayoutRunFc.item, (jlong)lpStruct->item); + (*env)->SetLongField(env, lpObject, PangoLayoutRunFc.glyphs, (jlong)lpStruct->glyphs); } #endif @@ -1447,10 +1447,10 @@ void cacheXAnyEventFields(JNIEnv *env, jobject lpObject) if (XAnyEventFc.cached) return; cacheXEventFields(env, lpObject); XAnyEventFc.clazz = (*env)->GetObjectClass(env, lpObject); - XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", I_J); + XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", "J"); XAnyEventFc.send_event = (*env)->GetFieldID(env, XAnyEventFc.clazz, "send_event", "I"); - XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", I_J); - XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", I_J); + XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", "J"); + XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", "J"); XAnyEventFc.cached = 1; } @@ -1458,10 +1458,10 @@ XAnyEvent *getXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct { if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject); getXEventFields(env, lpObject, (XEvent *)lpStruct); - lpStruct->serial = (*env)->GetIntLongField(env, lpObject, XAnyEventFc.serial); + lpStruct->serial = (*env)->GetLongField(env, lpObject, XAnyEventFc.serial); lpStruct->send_event = (*env)->GetIntField(env, lpObject, XAnyEventFc.send_event); - lpStruct->display = (Display *)(*env)->GetIntLongField(env, lpObject, XAnyEventFc.display); - lpStruct->window = (Window)(*env)->GetIntLongField(env, lpObject, XAnyEventFc.window); + lpStruct->display = (Display *)(*env)->GetLongField(env, lpObject, XAnyEventFc.display); + lpStruct->window = (Window)(*env)->GetLongField(env, lpObject, XAnyEventFc.window); return lpStruct; } @@ -1469,10 +1469,10 @@ void setXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct) { if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject); setXEventFields(env, lpObject, (XEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, XAnyEventFc.serial, (jintLong)lpStruct->serial); + (*env)->SetLongField(env, lpObject, XAnyEventFc.serial, (jlong)lpStruct->serial); (*env)->SetIntField(env, lpObject, XAnyEventFc.send_event, (jint)lpStruct->send_event); - (*env)->SetIntLongField(env, lpObject, XAnyEventFc.display, (jintLong)lpStruct->display); - (*env)->SetIntLongField(env, lpObject, XAnyEventFc.window, (jintLong)lpStruct->window); + (*env)->SetLongField(env, lpObject, XAnyEventFc.display, (jlong)lpStruct->display); + (*env)->SetLongField(env, lpObject, XAnyEventFc.window, (jlong)lpStruct->window); } #endif diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java index 825534c13e..cae0eb357a 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java @@ -205,25 +205,25 @@ public static final native int AtkTextRectangle_sizeof (); /** Natives */ /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_ACTION (); +public static final native long ATK_TYPE_ACTION (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_COMPONENT (); +public static final native long ATK_TYPE_COMPONENT (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_EDITABLE_TEXT (); +public static final native long ATK_TYPE_EDITABLE_TEXT (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_HYPERTEXT (); +public static final native long ATK_TYPE_HYPERTEXT (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_SELECTION (); +public static final native long ATK_TYPE_SELECTION (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_TABLE (); +public static final native long ATK_TYPE_TABLE (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_TEXT (); +public static final native long ATK_TYPE_TEXT (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_VALUE (); +public static final native long ATK_TYPE_VALUE (); /** @method flags=const */ -public static final native long /*int*/ ATK_TYPE_OBJECT_FACTORY (); -public static final native long /*int*/ _ATK_ACTION_GET_IFACE (long /*int*/ obj); -public static final long /*int*/ ATK_ACTION_GET_IFACE (long /*int*/ obj) { +public static final native long ATK_TYPE_OBJECT_FACTORY (); +public static final native long _ATK_ACTION_GET_IFACE (long obj); +public static final long ATK_ACTION_GET_IFACE (long obj) { lock.lock(); try { return _ATK_ACTION_GET_IFACE(obj); @@ -231,8 +231,8 @@ public static final long /*int*/ ATK_ACTION_GET_IFACE (long /*int*/ obj) { lock.unlock(); } } -public static final native long /*int*/ _ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle); -public static final long /*int*/ ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle) { +public static final native long _ATK_COMPONENT_GET_IFACE(long atkHandle); +public static final long ATK_COMPONENT_GET_IFACE(long atkHandle) { lock.lock(); try { return _ATK_COMPONENT_GET_IFACE(atkHandle); @@ -240,9 +240,9 @@ public static final long /*int*/ ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle) lock.unlock(); } } -public static final native long /*int*/ _ATK_OBJECT_FACTORY_CLASS (long /*int*/ klass); -public static final native long /*int*/ _ATK_SELECTION_GET_IFACE (long /*int*/ obj); -public static final long /*int*/ ATK_SELECTION_GET_IFACE (long /*int*/ obj) { +public static final native long _ATK_OBJECT_FACTORY_CLASS (long klass); +public static final native long _ATK_SELECTION_GET_IFACE (long obj); +public static final long ATK_SELECTION_GET_IFACE (long obj) { lock.lock(); try { return _ATK_SELECTION_GET_IFACE(obj); @@ -250,8 +250,8 @@ public static final long /*int*/ ATK_SELECTION_GET_IFACE (long /*int*/ obj) { lock.unlock(); } } -public static final native long /*int*/ _ATK_EDITABLE_TEXT_GET_IFACE (long /*int*/ handle); -public static final long /*int*/ ATK_EDITABLE_TEXT_GET_IFACE (long /*int*/ handle) { +public static final native long _ATK_EDITABLE_TEXT_GET_IFACE (long handle); +public static final long ATK_EDITABLE_TEXT_GET_IFACE (long handle) { lock.lock(); try { return _ATK_EDITABLE_TEXT_GET_IFACE(handle); @@ -259,8 +259,8 @@ public static final long /*int*/ ATK_EDITABLE_TEXT_GET_IFACE (long /*int*/ handl lock.unlock(); } } -public static final native long /*int*/ _ATK_HYPERTEXT_GET_IFACE (long /*int*/ handle); -public static final long /*int*/ ATK_HYPERTEXT_GET_IFACE (long /*int*/ handle) { +public static final native long _ATK_HYPERTEXT_GET_IFACE (long handle); +public static final long ATK_HYPERTEXT_GET_IFACE (long handle) { lock.lock(); try { return _ATK_HYPERTEXT_GET_IFACE(handle); @@ -268,8 +268,8 @@ public static final long /*int*/ ATK_HYPERTEXT_GET_IFACE (long /*int*/ handle) { lock.unlock(); } } -public static final native long /*int*/ _ATK_TABLE_GET_IFACE (long /*int*/ handle); -public static final long /*int*/ ATK_TABLE_GET_IFACE (long /*int*/ handle) { +public static final native long _ATK_TABLE_GET_IFACE (long handle); +public static final long ATK_TABLE_GET_IFACE (long handle) { lock.lock(); try { return _ATK_TABLE_GET_IFACE(handle); @@ -277,8 +277,8 @@ public static final long /*int*/ ATK_TABLE_GET_IFACE (long /*int*/ handle) { lock.unlock(); } } -public static final native long /*int*/ _ATK_TEXT_GET_IFACE (long /*int*/ handle); -public static final long /*int*/ ATK_TEXT_GET_IFACE (long /*int*/ handle) { +public static final native long _ATK_TEXT_GET_IFACE (long handle); +public static final long ATK_TEXT_GET_IFACE (long handle) { lock.lock(); try { return _ATK_TEXT_GET_IFACE(handle); @@ -286,8 +286,8 @@ public static final long /*int*/ ATK_TEXT_GET_IFACE (long /*int*/ handle) { lock.unlock(); } } -public static final native long /*int*/ _ATK_VALUE_GET_IFACE (long /*int*/ handle); -public static final long /*int*/ ATK_VALUE_GET_IFACE (long /*int*/ handle) { +public static final native long _ATK_VALUE_GET_IFACE (long handle); +public static final long ATK_VALUE_GET_IFACE (long handle) { lock.lock(); try { return _ATK_VALUE_GET_IFACE(handle); @@ -296,8 +296,8 @@ public static final long /*int*/ ATK_VALUE_GET_IFACE (long /*int*/ handle) { } } /** @param accessible cast=(AtkObject *) */ -public static final native void _atk_object_notify_state_change (long /*int*/ accessible, int state, boolean value); -public static final void atk_object_notify_state_change (long /*int*/ accessible, int state, boolean value) { +public static final native void _atk_object_notify_state_change (long accessible, int state, boolean value); +public static final void atk_object_notify_state_change (long accessible, int state, boolean value) { lock.lock(); try { _atk_object_notify_state_change(accessible, state, value); @@ -310,8 +310,8 @@ public static final void atk_object_notify_state_change (long /*int*/ accessible * @param relationship cast=(AtkRelationType) * @param target cast=(AtkObject *) */ -public static final native boolean _atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target); -public static final boolean atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target) { +public static final native boolean _atk_object_add_relationship (long object, int relationship, long target); +public static final boolean atk_object_add_relationship (long object, int relationship, long target) { lock.lock(); try { return _atk_object_add_relationship(object, relationship, target); @@ -324,8 +324,8 @@ public static final boolean atk_object_add_relationship (long /*int*/ object, in * @param relationship cast=(AtkRelationType) * @param target cast=(AtkObject *) */ -public static final native boolean _atk_object_remove_relationship (long /*int*/ object, int relationship, long /*int*/ target); -public static final boolean atk_object_remove_relationship (long /*int*/ object, int relationship, long /*int*/ target) { +public static final native boolean _atk_object_remove_relationship (long object, int relationship, long target); +public static final boolean atk_object_remove_relationship (long object, int relationship, long target) { lock.lock(); try { return _atk_object_remove_relationship(object, relationship, target); @@ -337,8 +337,8 @@ public static final boolean atk_object_remove_relationship (long /*int*/ object, * @param set cast=(AtkStateSet *) * @param type cast=(AtkStateType) */ -public static final native boolean _atk_state_set_add_state (long /*int*/ set, int type); -public static final boolean atk_state_set_add_state (long /*int*/ set, int type) { +public static final native boolean _atk_state_set_add_state (long set, int type); +public static final boolean atk_state_set_add_state (long set, int type) { lock.lock(); try { return _atk_state_set_add_state(set, type); @@ -346,8 +346,8 @@ public static final boolean atk_state_set_add_state (long /*int*/ set, int type) lock.unlock(); } } -public static final native long /*int*/ _atk_text_attribute_get_name (int attr); -public static final long /*int*/ atk_text_attribute_get_name (int attr) { +public static final native long _atk_text_attribute_get_name (int attr); +public static final long atk_text_attribute_get_name (int attr) { lock.lock(); try { return _atk_text_attribute_get_name(attr); @@ -355,8 +355,8 @@ public static final long /*int*/ atk_text_attribute_get_name (int attr) { lock.unlock(); } } -public static final native long /*int*/ _atk_text_attribute_get_value (int attr, int index); -public static final long /*int*/ atk_text_attribute_get_value (int attr, int index) { +public static final native long _atk_text_attribute_get_value (int attr, int index); +public static final long atk_text_attribute_get_value (int attr, int index) { lock.lock(); try { return _atk_text_attribute_get_value(attr, index); @@ -364,8 +364,8 @@ public static final long /*int*/ atk_text_attribute_get_value (int attr, int ind lock.unlock(); } } -public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0); -public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0) { +public static final native long _call (long function, long arg0); +public static final long call (long function, long arg0) { lock.lock(); try { return _call(function, arg0); @@ -373,8 +373,8 @@ public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0) lock.unlock(); } } -public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1); -public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1) { +public static final native long _call (long function, long arg0, long arg1); +public static final long call (long function, long arg0, long arg1) { lock.lock(); try { return _call(function, arg0, arg1); @@ -382,8 +382,8 @@ public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, lock.unlock(); } } -public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2); -public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) { +public static final native long _call (long function, long arg0, long arg1, long arg2); +public static final long call (long function, long arg0, long arg1, long arg2) { lock.lock(); try { return _call(function, arg0, arg1, arg2); @@ -391,8 +391,8 @@ public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, lock.unlock(); } } -public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4); -public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) { +public static final native long _call (long function, long arg0, long arg1, long arg2, long arg3, long arg4); +public static final long call (long function, long arg0, long arg1, long arg2, long arg3, long arg4) { lock.lock(); try { return _call(function, arg0, arg1, arg2, arg3, arg4); @@ -400,58 +400,58 @@ public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, lock.unlock(); } } -public static final native void memmove (AtkActionIface dest, long /*int*/ src); -public static final native void memmove (AtkComponentIface dest, long /*int*/ src); -public static final native void memmove (AtkEditableTextIface dest, long /*int*/ src); -public static final native void memmove (AtkHypertextIface dest, long /*int*/ src); -public static final native void memmove (AtkObjectClass dest, long /*int*/ src); -public static final native void memmove (AtkSelectionIface dest, long /*int*/ src); -public static final native void memmove (AtkTableIface dest, long /*int*/ src); -public static final native void memmove (AtkTextIface dest, long /*int*/ src); -public static final native void memmove (AtkValueIface dest, long /*int*/ src); -public static final native void memmove (long /*int*/ dest, AtkActionIface src); -public static final native void memmove (long /*int*/ dest, AtkComponentIface src); -public static final native void memmove (long /*int*/ dest, AtkEditableTextIface src); -public static final native void memmove (long /*int*/ dest, AtkHypertextIface src); -public static final native void memmove (long /*int*/ dest, AtkObjectClass src); -public static final native void memmove (long /*int*/ dest, AtkSelectionIface src); -public static final native void memmove (long /*int*/ dest, AtkTableIface src); -public static final native void memmove (long /*int*/ dest, AtkTextIface src); -public static final native void memmove (long /*int*/ dest, AtkValueIface src); +public static final native void memmove (AtkActionIface dest, long src); +public static final native void memmove (AtkComponentIface dest, long src); +public static final native void memmove (AtkEditableTextIface dest, long src); +public static final native void memmove (AtkHypertextIface dest, long src); +public static final native void memmove (AtkObjectClass dest, long src); +public static final native void memmove (AtkSelectionIface dest, long src); +public static final native void memmove (AtkTableIface dest, long src); +public static final native void memmove (AtkTextIface dest, long src); +public static final native void memmove (AtkValueIface dest, long src); +public static final native void memmove (long dest, AtkActionIface src); +public static final native void memmove (long dest, AtkComponentIface src); +public static final native void memmove (long dest, AtkEditableTextIface src); +public static final native void memmove (long dest, AtkHypertextIface src); +public static final native void memmove (long dest, AtkObjectClass src); +public static final native void memmove (long dest, AtkSelectionIface src); +public static final native void memmove (long dest, AtkTableIface src); +public static final native void memmove (long dest, AtkTextIface src); +public static final native void memmove (long dest, AtkValueIface src); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, AtkTextRectangle src, int size); +public static final native void memmove (long dest, AtkTextRectangle src, int size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (AtkTextRectangle dest, long /*int*/ src, int size); +public static final native void memmove (AtkTextRectangle dest, long src, int size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, AtkTextRange src, int size); +public static final native void memmove (long dest, AtkTextRange src, int size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (AtkTextRange dest, long /*int*/ src, int size); +public static final native void memmove (AtkTextRange dest, long src, int size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, AtkAttribute src, int size); +public static final native void memmove (long dest, AtkAttribute src, int size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (AtkAttribute dest, long /*int*/ src, int size); +public static final native void memmove (AtkAttribute dest, long src, int size); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java index 31d97a9547..e4f4863e72 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java @@ -18,17 +18,17 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkActionIface { // GTypeInterface parent; /** @field cast=(gboolean (*)()) */ - public long /*int*/ do_action; + public long do_action; /** @field cast=(gint (*)()) */ - public long /*int*/ get_n_actions; + public long get_n_actions; /** @field cast=(const gchar *(*)()) */ - public long /*int*/ get_description; + public long get_description; /** @field cast=(const gchar *(*)()) */ - public long /*int*/ get_name; + public long get_name; /** @field cast=(const gchar *(*)()) */ - public long /*int*/ get_keybinding; + public long get_keybinding; /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_description; + public long set_description; // AtkFunction pad1; // AtkFunction pad2; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java index c26ceef13b..d1f4db275d 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java @@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkAttribute { /** @field cast=(char *) */ - public long /*int*/ name; + public long name; /** @field cast=(char *) */ - public long /*int*/ value; + public long value; public static final int sizeof = ATK.AtkAttribute_sizeof (); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java index 1c3ab2276e..9dd406b94b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java @@ -17,29 +17,29 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkComponentIface { /** @field cast=(guint (*)()) */ - public long /*int*/ add_focus_handler; + public long add_focus_handler; /** @field cast=(gboolean (*)()) */ - public long /*int*/ contains; + public long contains; /** @field cast=(AtkObject *(*)()) */ - public long /*int*/ ref_accessible_at_point; + public long ref_accessible_at_point; /** @field cast=(void (*)()) */ - public long /*int*/ get_extents; + public long get_extents; /** @field cast=(void (*)()) */ - public long /*int*/ get_position; + public long get_position; /** @field cast=(void (*)()) */ - public long /*int*/ get_size; + public long get_size; /** @field cast=(gboolean (*)()) */ - public long /*int*/ grab_focus; + public long grab_focus; /** @field cast=(void (*)()) */ - public long /*int*/ remove_focus_handler; + public long remove_focus_handler; /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_extents; + public long set_extents; /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_position; + public long set_position; /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_size; + public long set_size; /** @field cast=(AtkLayer (*)()) */ - public long /*int*/ get_layer; + public long get_layer; /** @field cast=(gint (*)()) */ - public long /*int*/ get_mdi_zorder; + public long get_mdi_zorder; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java index 75750df4e9..b2c63e218c 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java @@ -16,17 +16,17 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkEditableTextIface { /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_run_attributes; + public long set_run_attributes; /** @field cast=(void (*)()) */ - public long /*int*/ set_text_contents; + public long set_text_contents; /** @field cast=(void (*)()) */ - public long /*int*/ insert_text; + public long insert_text; /** @field cast=(void (*)()) */ - public long /*int*/ copy_text; + public long copy_text; /** @field cast=(void (*)()) */ - public long /*int*/ cut_text; + public long cut_text; /** @field cast=(void (*)()) */ - public long /*int*/ delete_text; + public long delete_text; /** @field cast=(void (*)()) */ - public long /*int*/ paste_text; + public long paste_text; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java index 48a73e40ec..c2a73f25ea 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java @@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkHypertextIface { /** @field cast=(AtkHyperlink *(*)()) */ - public long /*int*/ get_link; + public long get_link; /** @field cast=(gint (*)()) */ - public long /*int*/ get_n_links; + public long get_n_links; /** @field cast=(gint (*)()) */ - public long /*int*/ get_link_index; + public long get_link_index; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java index 726d1c0f59..391b06d9b7 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java @@ -17,51 +17,51 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkObjectClass { /** @field cast=(const gchar *(*)()) */ - public long /*int*/ get_name; + public long get_name; /** @field cast=(const gchar *(*)()) */ - public long /*int*/ get_description; + public long get_description; /** @field cast=(AtkObject *(*)()) */ - public long /*int*/ get_parent; + public long get_parent; /** @field cast=(gint (*)()) */ - public long /*int*/ get_n_children; + public long get_n_children; /** @field cast=(AtkObject *(*)()) */ - public long /*int*/ ref_child; + public long ref_child; /** @field cast=(gint (*)()) */ - public long /*int*/ get_index_in_parent; + public long get_index_in_parent; /** @field cast=(AtkRelationSet *(*)()) */ - public long /*int*/ ref_relation_set; + public long ref_relation_set; /** @field cast=(AtkRole (*)()) */ - public long /*int*/ get_role; + public long get_role; /** @field cast=(AtkLayer (*)()) */ - public long /*int*/ get_layer; + public long get_layer; /** @field cast=(gint (*)()) */ - public long /*int*/ get_mdi_zorder; + public long get_mdi_zorder; /** @field cast=(AtkStateSet *(*)()) */ - public long /*int*/ ref_state_set; + public long ref_state_set; /** @field cast=(void (*)()) */ - public long /*int*/ set_name; + public long set_name; /** @field cast=(void (*)()) */ - public long /*int*/ set_description; + public long set_description; /** @field cast=(void (*)()) */ - public long /*int*/ set_parent; + public long set_parent; /** @field cast=(void (*)()) */ - public long /*int*/ set_role; + public long set_role; /** @field cast=(guint (*)()) */ - public long /*int*/ connect_property_change_handler; + public long connect_property_change_handler; /** @field cast=(void (*)()) */ - public long /*int*/ remove_property_change_handler; + public long remove_property_change_handler; /** @field cast=(void (*)()) */ - public long /*int*/ initialize; + public long initialize; /** @field cast=(void (*)()) */ - public long /*int*/ children_changed; + public long children_changed; /** @field cast=(void (*)()) */ - public long /*int*/ focus_event; + public long focus_event; /** @field cast=(void (*)()) */ - public long /*int*/ property_change; + public long property_change; /** @field cast=(void (*)()) */ - public long /*int*/ state_change; + public long state_change; /** @field cast=(void (*)()) */ - public long /*int*/ visible_data_changed; + public long visible_data_changed; /** @field accessor=SWT_AtkObjectClass_get_attributes,cast=(SWT_AtkObjectClass_get_attributes_cast) */ - public long /*int*/ get_attributes; + public long get_attributes; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java index 0b6f9f805e..77a8a64ef2 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java @@ -17,19 +17,19 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkSelectionIface { /** @field cast=(gboolean (*)()) */ - public long /*int*/ add_selection; + public long add_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ clear_selection; + public long clear_selection; /** @field cast=(AtkObject *(*)()) */ - public long /*int*/ ref_selection; + public long ref_selection; /** @field cast=(gint (*)()) */ - public long /*int*/ get_selection_count; + public long get_selection_count; /** @field cast=(gboolean (*)()) */ - public long /*int*/ is_child_selected; + public long is_child_selected; /** @field cast=(gboolean (*)()) */ - public long /*int*/ remove_selection; + public long remove_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ select_all_selection; + public long select_all_selection; /** @field cast=(void (*)()) */ - public long /*int*/ selection_changed; + public long selection_changed; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java index e68246fbf9..a038efa72d 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java @@ -17,75 +17,75 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkTableIface { /** @field cast=(AtkObject* (*)()) */ - public long /*int*/ ref_at; + public long ref_at; /** @field cast=(gint (*)()) */ - public long /*int*/ get_index_at; + public long get_index_at; /** @field cast=(gint (*)()) */ - public long /*int*/ get_column_at_index; + public long get_column_at_index; /** @field cast=(gint (*)()) */ - public long /*int*/ get_row_at_index; + public long get_row_at_index; /** @field cast=(gint (*)()) */ - public long /*int*/ get_n_columns; + public long get_n_columns; /** @field cast=(gint (*)()) */ - public long /*int*/ get_n_rows; + public long get_n_rows; /** @field cast=(gint (*)()) */ - public long /*int*/ get_column_extent_at; + public long get_column_extent_at; /** @field cast=(gint (*)()) */ - public long /*int*/ get_row_extent_at; + public long get_row_extent_at; /** @field cast=(AtkObject* (*)()) */ - public long /*int*/ get_caption; + public long get_caption; /** @field cast=(const gchar* (*)()) */ - public long /*int*/ get_column_description; + public long get_column_description; /** @field cast=(AtkObject* (*)()) */ - public long /*int*/ get_column_header; + public long get_column_header; /** @field cast=(const gchar* (*)()) */ - public long /*int*/ get_row_description; + public long get_row_description; /** @field cast=(AtkObject* (*)()) */ - public long /*int*/ get_row_header; + public long get_row_header; /** @field cast=(AtkObject* (*)()) */ - public long /*int*/ get_summary; + public long get_summary; /** @field cast=(void (*)()) */ - public long /*int*/ set_caption; + public long set_caption; /** @field cast=(void (*)()) */ - public long /*int*/ set_column_description; + public long set_column_description; /** @field cast=(void (*)()) */ - public long /*int*/ set_column_header; + public long set_column_header; /** @field cast=(void (*)()) */ - public long /*int*/ set_row_description; + public long set_row_description; /** @field cast=(void (*)()) */ - public long /*int*/ set_row_header; + public long set_row_header; /** @field cast=(void (*)()) */ - public long /*int*/ set_summary; + public long set_summary; /** @field cast=(gint (*)()) */ - public long /*int*/ get_selected_columns; + public long get_selected_columns; /** @field cast=(gint (*)()) */ - public long /*int*/ get_selected_rows; + public long get_selected_rows; /** @field cast=(gboolean (*)()) */ - public long /*int*/ is_column_selected; + public long is_column_selected; /** @field cast=(gboolean (*)()) */ - public long /*int*/ is_row_selected; + public long is_row_selected; /** @field cast=(gboolean (*)()) */ - public long /*int*/ is_selected; + public long is_selected; /** @field cast=(gboolean (*)()) */ - public long /*int*/ add_row_selection; + public long add_row_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ remove_row_selection; + public long remove_row_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ add_column_selection; + public long add_column_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ remove_column_selection; + public long remove_column_selection; /** @field cast=(void (*)()) */ - public long /*int*/ row_inserted; + public long row_inserted; /** @field cast=(void (*)()) */ - public long /*int*/ column_inserted; + public long column_inserted; /** @field cast=(void (*)()) */ - public long /*int*/ row_deleted; + public long row_deleted; /** @field cast=(void (*)()) */ - public long /*int*/ column_deleted; + public long column_deleted; /** @field cast=(void (*)()) */ - public long /*int*/ row_reordered; + public long row_reordered; /** @field cast=(void (*)()) */ - public long /*int*/ column_reordered; + public long column_reordered; /** @field cast=(void (*)()) */ - public long /*int*/ model_changed; + public long model_changed; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java index 84c6359acd..33f8cc8459 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java @@ -17,47 +17,47 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkTextIface { /** @field cast=(gchar *(*)()) */ - public long /*int*/ get_text; + public long get_text; /** @field cast=(gchar *(*)()) */ - public long /*int*/ get_text_after_offset; + public long get_text_after_offset; /** @field cast=(gchar *(*)()) */ - public long /*int*/ get_text_at_offset; + public long get_text_at_offset; /** @field cast=(gunichar (*)()) */ - public long /*int*/ get_character_at_offset; + public long get_character_at_offset; /** @field cast=(gchar *(*)()) */ - public long /*int*/ get_text_before_offset; + public long get_text_before_offset; /** @field cast=(gint (*)()) */ - public long /*int*/ get_caret_offset; + public long get_caret_offset; /** @field cast=(AtkAttributeSet *(*)()) */ - public long /*int*/ get_run_attributes; + public long get_run_attributes; /** @field cast=(AtkAttributeSet *(*)()) */ - public long /*int*/ get_default_attributes; + public long get_default_attributes; /** @field cast=(void (*)()) */ - public long /*int*/ get_character_extents; + public long get_character_extents; /** @field cast=(gint (*)()) */ - public long /*int*/ get_character_count; + public long get_character_count; /** @field cast=(gint (*)()) */ - public long /*int*/ get_offset_at_point; + public long get_offset_at_point; /** @field cast=(gint (*)()) */ - public long /*int*/ get_n_selections; + public long get_n_selections; /** @field cast=(gchar *(*)()) */ - public long /*int*/ get_selection; + public long get_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ add_selection; + public long add_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ remove_selection; + public long remove_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_selection; + public long set_selection; /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_caret_offset; + public long set_caret_offset; /** @field cast=(void (*)()) */ - public long /*int*/ text_changed; + public long text_changed; /** @field cast=(void (*)()) */ - public long /*int*/ text_caret_moved; + public long text_caret_moved; /** @field cast=(void (*)()) */ - public long /*int*/ text_selection_changed; + public long text_selection_changed; /** @field cast=(void (*)()) */ - public long /*int*/ get_range_extents; + public long get_range_extents; /** @field cast=(AtkTextRange** (*)()) */ - public long /*int*/ get_bounded_ranges; + public long get_bounded_ranges; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java index dace732335..f5ef87e714 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java @@ -20,7 +20,7 @@ public class AtkTextRange { public int start_offset; public int end_offset; /** @field cast=(gchar *) */ - public long /*int*/ content; + public long content; public static final int sizeof = ATK.AtkTextRange_sizeof (); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java index 65ee768979..45c93192da 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java @@ -17,11 +17,11 @@ package org.eclipse.swt.internal.accessibility.gtk; public class AtkValueIface { /** @field cast=(void (*)()) */ - public long /*int*/ get_current_value; + public long get_current_value; /** @field cast=(void (*)()) */ - public long /*int*/ get_maximum_value; + public long get_maximum_value; /** @field cast=(void (*)()) */ - public long /*int*/ get_minimum_value; + public long get_minimum_value; /** @field cast=(gboolean (*)()) */ - public long /*int*/ set_current_value; + public long set_current_value; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java index ad92525ce6..400eeb7802 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java @@ -292,14 +292,14 @@ public class GDK extends OS { /** Macros */ /** @param event cast=(GdkEvent *) */ - public static final native int GDK_EVENT_TYPE(long /*int*/ event); + public static final native int GDK_EVENT_TYPE(long event); /** @param event cast=(GdkEventAny *) */ - public static final native long /*int*/ GDK_EVENT_WINDOW(long /*int*/ event); + public static final native long GDK_EVENT_WINDOW(long event); /** @param display cast=(GdkDisplay *) */ - public static final native boolean GDK_IS_X11_DISPLAY(long /*int*/ display); + public static final native boolean GDK_IS_X11_DISPLAY(long display); /** @method flags=const */ - public static final native long /*int*/ _GDK_TYPE_RGBA(); - public static final long /*int*/ GDK_TYPE_RGBA() { + public static final native long _GDK_TYPE_RGBA(); + public static final long GDK_TYPE_RGBA() { lock.lock(); try { return _GDK_TYPE_RGBA(); @@ -308,8 +308,8 @@ public class GDK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GDK_TYPE_PIXBUF(); - public static final long /*int*/ GDK_TYPE_PIXBUF() { + public static final native long _GDK_TYPE_PIXBUF(); + public static final long GDK_TYPE_PIXBUF() { lock.lock(); try { return _GDK_TYPE_PIXBUF(); @@ -319,8 +319,8 @@ public class GDK extends OS { } /** @param gdkdisplay cast=(GdkDisplay *) */ - public static final native long /*int*/ _gdk_x11_display_get_xdisplay(long /*int*/ gdkdisplay); - public static final long /*int*/ gdk_x11_display_get_xdisplay (long /*int*/ gdkdisplay) { + public static final native long _gdk_x11_display_get_xdisplay(long gdkdisplay); + public static final long gdk_x11_display_get_xdisplay (long gdkdisplay) { lock.lock(); try { return _gdk_x11_display_get_xdisplay(gdkdisplay); @@ -328,8 +328,8 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_x11_get_default_xdisplay(); - public static final long /*int*/ gdk_x11_get_default_xdisplay () { + public static final native long _gdk_x11_get_default_xdisplay(); + public static final long gdk_x11_get_default_xdisplay () { lock.lock(); try { return _gdk_x11_get_default_xdisplay(); @@ -341,9 +341,9 @@ public class GDK extends OS { * @method flags=dynamic * @param xvisualid cast=(VisualID) */ - public static final native long /*int*/ _gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid); + public static final native long _gdk_x11_screen_lookup_visual(long screen, int xvisualid); /** [GTK3/GTK4, GTK3 uses GdkScreen but GTK4 uses GdkX11Screen -- method signature otherwise identical] */ - public static final long /*int*/ gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid) { + public static final long gdk_x11_screen_lookup_visual(long screen, int xvisualid) { lock.lock(); try { return _gdk_x11_screen_lookup_visual(screen, xvisualid); @@ -354,9 +354,9 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_x11_screen_get_window_manager_name(long /*int*/ screen); + public static final native long _gdk_x11_screen_get_window_manager_name(long screen); /** [GTK3/GTK4, GTK3 uses GdkScreen but GTK4 uses GdkX11Screen -- method signature otherwise identical] */ - public static final long /*int*/ gdk_x11_screen_get_window_manager_name(long /*int*/ screen) { + public static final long gdk_x11_screen_get_window_manager_name(long screen) { lock.lock(); try { return _gdk_x11_screen_get_window_manager_name(screen); @@ -367,9 +367,9 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_x11_visual_get_xvisual(long /*int*/ visual); + public static final native long _gdk_x11_visual_get_xvisual(long visual); /** [GTK3/GTK4, GTK3 uses GdkVisual but GTK4 uses GdkX11Visual -- method signature otherwise identical] */ - public static final long /*int*/ gdk_x11_visual_get_xvisual(long /*int*/ visual) { + public static final long gdk_x11_visual_get_xvisual(long visual) { lock.lock(); try { return _gdk_x11_visual_get_xvisual(visual); @@ -380,9 +380,9 @@ public class GDK extends OS { /** * @param gdkwindow cast=(GdkWindow *) */ - public static final native long /*int*/ _gdk_x11_window_get_xid(long /*int*/ gdkwindow); + public static final native long _gdk_x11_window_get_xid(long gdkwindow); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_x11_window_get_xid(long /*int*/ gdkwindow) { + public static final long gdk_x11_window_get_xid(long gdkwindow) { lock.lock(); try { return _gdk_x11_window_get_xid(gdkwindow); @@ -394,9 +394,9 @@ public class GDK extends OS { /** * @param surface cast=(GdkSurface *) */ - public static final native long /*int*/ _gdk_x11_surface_get_xid(long /*int*/ surface); + public static final native long _gdk_x11_surface_get_xid(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_x11_surface_get_xid(long /*int*/ surface) { + public static final long gdk_x11_surface_get_xid(long surface) { lock.lock(); try { return _gdk_x11_surface_get_xid(surface); @@ -408,9 +408,9 @@ public class GDK extends OS { * @param gdkdisplay cast=(GdkDisplay *) * @param xid cast=(Window) */ - public static final native long /*int*/ _gdk_x11_window_lookup_for_display(long /*int*/ gdkdisplay, long /*int*/ xid); + public static final native long _gdk_x11_window_lookup_for_display(long gdkdisplay, long xid); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_x11_window_lookup_for_display(long /*int*/ gdkdisplay, long /*int*/ xid) { + public static final long gdk_x11_window_lookup_for_display(long gdkdisplay, long xid) { lock.lock(); try { return _gdk_x11_window_lookup_for_display(gdkdisplay, xid); @@ -422,9 +422,9 @@ public class GDK extends OS { * @param gdkdisplay cast=(GdkDisplay *) * @param xid cast=(Window) */ - public static final native long /*int*/ _gdk_x11_surface_lookup_for_display(long /*int*/ gdkdisplay, long /*int*/ xid); + public static final native long _gdk_x11_surface_lookup_for_display(long gdkdisplay, long xid); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_x11_surface_lookup_for_display(long /*int*/ gdkdisplay, long /*int*/ xid) { + public static final long gdk_x11_surface_lookup_for_display(long gdkdisplay, long xid) { lock.lock(); try { return _gdk_x11_surface_lookup_for_display(gdkdisplay, xid); @@ -436,9 +436,9 @@ public class GDK extends OS { * @method flags=dynamic * @param atom_name cast=(const gchar *),flags=no_out critical */ - public static final native long /*int*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists); + public static final native long _gdk_atom_intern(byte[] atom_name, boolean only_if_exists); /** [GTK3 only] */ - public static final long /*int*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) { + public static final long gdk_atom_intern(byte[] atom_name, boolean only_if_exists) { lock.lock(); try { return _gdk_atom_intern(atom_name, only_if_exists); @@ -447,9 +447,9 @@ public class GDK extends OS { } } /** @param atom cast=(GdkAtom) */ - public static final native long /*int*/ _gdk_atom_name(long /*int*/ atom); + public static final native long _gdk_atom_name(long atom); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_atom_name(long /*int*/ atom) { + public static final long gdk_atom_name(long atom) { lock.lock(); try { return _gdk_atom_name(atom); @@ -460,8 +460,8 @@ public class GDK extends OS { /** * @param display cast=(GdkDisplay *) */ - public static final native void _gdk_display_beep(long /*int*/ display); - public static final void gdk_display_beep(long /*int*/ display) { + public static final native void _gdk_display_beep(long display); + public static final void gdk_display_beep(long display) { lock.lock(); try { _gdk_display_beep(display); @@ -473,9 +473,9 @@ public class GDK extends OS { * @method flags=dynamic * @param window cast=(GdkWindow *) */ - public static final native long /*int*/ _gdk_cairo_create(long /*int*/ window); + public static final native long _gdk_cairo_create(long window); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final long /*int*/ gdk_cairo_create(long /*int*/ window) { + public static final long gdk_cairo_create(long window) { lock.lock(); try { return _gdk_cairo_create(window); @@ -487,8 +487,8 @@ public class GDK extends OS { * @param cr cast=(cairo_t *) * @param rect cast=(GdkRectangle *),flags=no_in */ - public static final native boolean _gdk_cairo_get_clip_rectangle(long /*int*/ cr, GdkRectangle rect); - public static final boolean gdk_cairo_get_clip_rectangle(long /*int*/ cr, GdkRectangle rect) { + public static final native boolean _gdk_cairo_get_clip_rectangle(long cr, GdkRectangle rect); + public static final boolean gdk_cairo_get_clip_rectangle(long cr, GdkRectangle rect) { lock.lock(); try { return _gdk_cairo_get_clip_rectangle(cr, rect); @@ -500,8 +500,8 @@ public class GDK extends OS { * @param cairo cast=(cairo_t *) * @param region cast=(cairo_region_t *) */ - public static final native void _gdk_cairo_region(long /*int*/ cairo, long /*int*/ region); - public static final void gdk_cairo_region(long /*int*/ cairo, long /*int*/ region) { + public static final native void _gdk_cairo_region(long cairo, long region); + public static final void gdk_cairo_region(long cairo, long region) { lock.lock(); try { _gdk_cairo_region(cairo, region); @@ -513,8 +513,8 @@ public class GDK extends OS { * @param cairo cast=(cairo_t *) * @param rgba cast=(const GdkRGBA *) */ - public static final native void _gdk_cairo_set_source_rgba(long /*int*/ cairo, GdkRGBA rgba); - public static final void gdk_cairo_set_source_rgba(long /*int*/ cairo, GdkRGBA rgba) { + public static final native void _gdk_cairo_set_source_rgba(long cairo, GdkRGBA rgba); + public static final void gdk_cairo_set_source_rgba(long cairo, GdkRGBA rgba) { lock.lock(); try { _gdk_cairo_set_source_rgba(cairo, rgba); @@ -525,9 +525,9 @@ public class GDK extends OS { /** * @param window cast=(GdkWindow *) */ - public static final native int _gdk_window_get_state(long /*int*/ window); + public static final native int _gdk_window_get_state(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final int gdk_window_get_state(long /*int*/ window) { + public static final int gdk_window_get_state(long window) { lock.lock(); try { return _gdk_window_get_state(window); @@ -538,9 +538,9 @@ public class GDK extends OS { /** * @param window cast=(GdkWindow *) */ - public static final native int _gdk_window_get_width(long /*int*/ window); + public static final native int _gdk_window_get_width(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final int gdk_window_get_width(long /*int*/ window) { + public static final int gdk_window_get_width(long window) { lock.lock(); try { return _gdk_window_get_width(window); @@ -551,9 +551,9 @@ public class GDK extends OS { /** * @param surface cast=(GdkSurface *) */ - public static final native int _gdk_surface_get_width(long /*int*/ surface); + public static final native int _gdk_surface_get_width(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final int gdk_surface_get_width(long /*int*/ surface) { + public static final int gdk_surface_get_width(long surface) { lock.lock(); try { return _gdk_surface_get_width(surface); @@ -577,9 +577,9 @@ public class GDK extends OS { /** * @param window cast=(GdkWindow *) */ - public static final native long /*int*/ _gdk_window_get_visible_region(long /*int*/ window); + public static final native long _gdk_window_get_visible_region(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_window_get_visible_region(long /*int*/ window) { + public static final long gdk_window_get_visible_region(long window) { lock.lock(); try { return _gdk_window_get_visible_region(window); @@ -590,9 +590,9 @@ public class GDK extends OS { /** * @param window cast=(GdkWindow *) */ - public static final native int _gdk_window_get_height(long /*int*/ window); + public static final native int _gdk_window_get_height(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final int gdk_window_get_height(long /*int*/ window) { + public static final int gdk_window_get_height(long window) { lock.lock(); try { return _gdk_window_get_height(window); @@ -603,9 +603,9 @@ public class GDK extends OS { /** * @param surface cast=(GdkSurface *) */ - public static final native int _gdk_surface_get_height(long /*int*/ surface); + public static final native int _gdk_surface_get_height(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final int gdk_surface_get_height(long /*int*/ surface) { + public static final int gdk_surface_get_height(long surface) { lock.lock(); try { return _gdk_surface_get_height(surface); @@ -619,8 +619,8 @@ public class GDK extends OS { * @param pixbuf_x cast=(gdouble) * @param pixbuf_y cast=(gdouble) */ - public static final native void _gdk_cairo_set_source_pixbuf(long /*int*/ cairo, long /*int*/ pixbuf, double pixbuf_x, double pixbuf_y); - public static final void gdk_cairo_set_source_pixbuf(long /*int*/ cairo, long /*int*/ pixbuf, double pixbuf_x, double pixbuf_y) { + public static final native void _gdk_cairo_set_source_pixbuf(long cairo, long pixbuf, double pixbuf_x, double pixbuf_y); + public static final void gdk_cairo_set_source_pixbuf(long cairo, long pixbuf, double pixbuf_x, double pixbuf_y) { lock.lock(); try { _gdk_cairo_set_source_pixbuf(cairo,pixbuf,pixbuf_x,pixbuf_y); @@ -635,9 +635,9 @@ public class GDK extends OS { * @param x cast=(gdouble) * @param y cast=(gdouble) */ - public static final native void _gdk_cairo_set_source_window(long /*int*/ cairo, long /*int*/ window, int x, int y); + public static final native void _gdk_cairo_set_source_window(long cairo, long window, int x, int y); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_cairo_set_source_window(long /*int*/ cairo, long /*int*/ window, int x, int y) { + public static final void gdk_cairo_set_source_window(long cairo, long window, int x, int y) { lock.lock(); try { _gdk_cairo_set_source_window(cairo, window, x, y); @@ -649,9 +649,9 @@ public class GDK extends OS { /** @param display cast=(GdkDisplay *) * @param cursor_type cast=(GdkCursorType) */ - public static final native long /*int*/ _gdk_cursor_new_for_display(long /*int*/ display, long /*int*/ cursor_type); + public static final native long _gdk_cursor_new_for_display(long display, long cursor_type); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_cursor_new_for_display(long /*int*/ display, long /*int*/ cursor_type) { + public static final long gdk_cursor_new_for_display(long display, long cursor_type) { lock.lock(); try { return _gdk_cursor_new_for_display(display, cursor_type); @@ -663,9 +663,9 @@ public class GDK extends OS { * @param display cast=(GdkDisplay *) * @param cursor_name cast=(const gchar *) */ - public static final native long /*int*/ _gdk_cursor_new_from_name(long /*int*/ display, byte[] cursor_name); + public static final native long _gdk_cursor_new_from_name(long display, byte[] cursor_name); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_cursor_new_from_name(long /*int*/ display, byte[] cursor_name) { + public static final long gdk_cursor_new_from_name(long display, byte[] cursor_name) { lock.lock(); try { return _gdk_cursor_new_from_name(display, cursor_name); @@ -677,9 +677,9 @@ public class GDK extends OS { * @param cursor_name cast=(const gchar *) * @param fallback cast=(GdkCursor *) */ - public static final native long /*int*/ _gdk_cursor_new_from_name(byte[] cursor_name, long /*int*/ fallback); + public static final native long _gdk_cursor_new_from_name(byte[] cursor_name, long fallback); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_cursor_new_from_name(byte[] cursor_name, long /*int*/ fallback) { + public static final long gdk_cursor_new_from_name(byte[] cursor_name, long fallback) { lock.lock(); try { return _gdk_cursor_new_from_name(cursor_name, fallback); @@ -693,9 +693,9 @@ public class GDK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native long /*int*/ _gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y); + public static final native long _gdk_cursor_new_from_pixbuf(long display, long pixbuf, int x, int y); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y) { + public static final long gdk_cursor_new_from_pixbuf(long display, long pixbuf, int x, int y) { lock.lock(); try { return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y); @@ -709,9 +709,9 @@ public class GDK extends OS { * @param y cast=(gint) * @param fallback cast=(GdkCursor *) */ - public static final native long /*int*/ _gdk_cursor_new_from_texture(long /*int*/ texture, int x, int y, long /*int*/ fallback); + public static final native long _gdk_cursor_new_from_texture(long texture, int x, int y, long fallback); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_cursor_new_from_texture(long /*int*/ texture, int x, int y, long /*int*/ fallback) { + public static final long gdk_cursor_new_from_texture(long texture, int x, int y, long fallback) { lock.lock(); try { return _gdk_cursor_new_from_texture(texture, x, y, fallback); @@ -725,9 +725,9 @@ public class GDK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native void _gdk_device_warp(long /*int*/ device, long /*int*/ screen, int x, int y); + public static final native void _gdk_device_warp(long device, long screen, int x, int y); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_device_warp(long /*int*/ device, long /*int*/ screen, int x, int y) { + public static final void gdk_device_warp(long device, long screen, int x, int y) { lock.lock(); try { _gdk_device_warp(device, screen, x, y); @@ -740,9 +740,9 @@ public class GDK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native void _gdk_device_warp(long /*int*/ device, int x, int y); + public static final native void _gdk_device_warp(long device, int x, int y); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_device_warp(long /*int*/ device, int x, int y) { + public static final void gdk_device_warp(long device, int x, int y) { lock.lock(); try { _gdk_device_warp(device, x, y); @@ -750,8 +750,8 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_display_get_default(); - public static final long /*int*/ gdk_display_get_default() { + public static final native long _gdk_display_get_default(); + public static final long gdk_display_get_default() { lock.lock(); try { return _gdk_display_get_default(); @@ -762,8 +762,8 @@ public class GDK extends OS { /** * @param display cast=(GdkDisplay *) */ - public static final native long /*int*/ _gdk_display_get_default_group(long /*int*/ display); - public static final long /*int*/ gdk_display_get_default_group(long /*int*/ display) { + public static final native long _gdk_display_get_default_group(long display); + public static final long gdk_display_get_default_group(long display) { lock.lock(); try { return _gdk_display_get_default_group(display); @@ -774,8 +774,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_display_get_default_seat(long /*int*/ display); - public static final long /*int*/ gdk_display_get_default_seat(long /*int*/ display) { + public static final native long _gdk_display_get_default_seat(long display); + public static final long gdk_display_get_default_seat(long display) { lock.lock(); try { return _gdk_display_get_default_seat(display); @@ -786,9 +786,9 @@ public class GDK extends OS { /** * @param window cast=(GdkWindow *) */ - public static final native long /*int*/ _gdk_window_get_display(long /*int*/ window); + public static final native long _gdk_window_get_display(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_window_get_display(long /*int*/ window) { + public static final long gdk_window_get_display(long window) { lock.lock(); try { return _gdk_window_get_display(window); @@ -799,9 +799,9 @@ public class GDK extends OS { /** * @param surface cast=(GdkSurface *) */ - public static final native long /*int*/ _gdk_surface_get_display(long /*int*/ surface); + public static final native long _gdk_surface_get_display(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_surface_get_display(long /*int*/ surface) { + public static final long gdk_surface_get_display(long surface) { lock.lock(); try { return _gdk_surface_get_display(surface); @@ -813,8 +813,8 @@ public class GDK extends OS { * @method flags=dynamic * @param display cast=(GdkDisplay *) */ - public static final native long /*int*/ _gdk_display_get_device_manager(long /*int*/ display); - public static final long /*int*/ gdk_display_get_device_manager(long /*int*/ display) { + public static final native long _gdk_display_get_device_manager(long display); + public static final long gdk_display_get_device_manager(long display) { lock.lock(); try { return _gdk_display_get_device_manager(display); @@ -823,8 +823,8 @@ public class GDK extends OS { } } /** @method flags=dynamic */ - public static final native long /*int*/ _gdk_device_manager_get_client_pointer(long /*int*/ device_manager); - public static final long /*int*/ gdk_device_manager_get_client_pointer(long /*int*/ device_manager) { + public static final native long _gdk_device_manager_get_client_pointer(long device_manager); + public static final long gdk_device_manager_get_client_pointer(long device_manager) { lock.lock(); try { return _gdk_device_manager_get_client_pointer(device_manager); @@ -837,9 +837,9 @@ public class GDK extends OS { * @param win_x cast=(gint *) * @param win_y cast=(gint *) */ - public static final native long /*int*/ _gdk_device_get_window_at_position(long /*int*/ device, int[] win_x, int[] win_y); + public static final native long _gdk_device_get_window_at_position(long device, int[] win_x, int[] win_y); /** [GTK3 only] */ - public static final long /*int*/ gdk_device_get_window_at_position(long /*int*/ device, int[] win_x, int[] win_y) { + public static final long gdk_device_get_window_at_position(long device, int[] win_x, int[] win_y) { lock.lock(); try { return _gdk_device_get_window_at_position(device, win_x, win_y); @@ -852,9 +852,9 @@ public class GDK extends OS { * @param win_x cast=(gint *) * @param win_y cast=(gint *) */ - public static final native long /*int*/ _gdk_device_get_surface_at_position(long /*int*/ device, int[] win_x, int[] win_y); + public static final native long _gdk_device_get_surface_at_position(long device, int[] win_x, int[] win_y); /** [GTK4 only] */ - public static final long /*int*/ gdk_device_get_surface_at_position(long /*int*/ device, int[] win_x, int[] win_y) { + public static final long gdk_device_get_surface_at_position(long device, int[] win_x, int[] win_y) { lock.lock(); try { return _gdk_device_get_surface_at_position(device, win_x, win_y); @@ -865,9 +865,9 @@ public class GDK extends OS { /** * @param display cast=(GdkDisplay *) */ - public static final native boolean _gdk_display_supports_cursor_color(long /*int*/ display); + public static final native boolean _gdk_display_supports_cursor_color(long display); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gdk_display_supports_cursor_color(long /*int*/ display) { + public static final boolean gdk_display_supports_cursor_color(long display) { lock.lock(); try { return _gdk_display_supports_cursor_color(display); @@ -878,8 +878,8 @@ public class GDK extends OS { /** * @param context cast=(GdkDragContext *) */ - public static final native int _gdk_drag_context_get_actions(long /*int*/ context); - public static final int gdk_drag_context_get_actions(long /*int*/ context) { + public static final native int _gdk_drag_context_get_actions(long context); + public static final int gdk_drag_context_get_actions(long context) { lock.lock(); try { return _gdk_drag_context_get_actions(context); @@ -890,9 +890,9 @@ public class GDK extends OS { /** * @param context cast=(GdkDragContext *) */ - public static final native long /*int*/ _gdk_drag_context_get_dest_window(long /*int*/ context); + public static final native long _gdk_drag_context_get_dest_window(long context); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_drag_context_get_dest_window(long /*int*/ context) { + public static final long gdk_drag_context_get_dest_window(long context) { lock.lock(); try { return _gdk_drag_context_get_dest_window(context); @@ -903,8 +903,8 @@ public class GDK extends OS { /** * @param context cast=(GdkDragContext *) */ - public static final native int _gdk_drag_context_get_selected_action(long /*int*/ context); - public static final int gdk_drag_context_get_selected_action(long /*int*/ context) { + public static final native int _gdk_drag_context_get_selected_action(long context); + public static final int gdk_drag_context_get_selected_action(long context) { lock.lock(); try { return _gdk_drag_context_get_selected_action(context); @@ -915,9 +915,9 @@ public class GDK extends OS { /** * @param context cast=(GdkDragContext *) */ - public static final native long /*int*/ _gdk_drag_context_list_targets(long /*int*/ context); + public static final native long _gdk_drag_context_list_targets(long context); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_drag_context_list_targets(long /*int*/ context) { + public static final long gdk_drag_context_list_targets(long context) { lock.lock(); try { return _gdk_drag_context_list_targets(context); @@ -930,9 +930,9 @@ public class GDK extends OS { * @param action cast=(GdkDragAction) * @param time cast=(guint32) */ - public static final native void _gdk_drag_status(long /*int*/ context, int action, int time); + public static final native void _gdk_drag_status(long context, int action, int time); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_drag_status(long /*int*/ context, int action, int time) { + public static final void gdk_drag_status(long context, int action, int time) { lock.lock(); try { _gdk_drag_status(context, action, time); @@ -944,8 +944,8 @@ public class GDK extends OS { * @param context cast=(GdkDrawingContext *) * @method flags=dynamic */ - public static final native long /*int*/ _gdk_drawing_context_get_cairo_context(long /*int*/ context); - public static final long /*int*/ gdk_drawing_context_get_cairo_context(long /*int*/ context) { + public static final native long _gdk_drawing_context_get_cairo_context(long context); + public static final long gdk_drawing_context_get_cairo_context(long context) { lock.lock(); try { return _gdk_drawing_context_get_cairo_context(context); @@ -954,8 +954,8 @@ public class GDK extends OS { } } /** @param event cast=(GdkEvent *) */ - public static final native long /*int*/ _gdk_event_copy(long /*int*/ event); - public static final long /*int*/ gdk_event_copy(long /*int*/ event) { + public static final native long _gdk_event_copy(long event); + public static final long gdk_event_copy(long event) { lock.lock(); try { return _gdk_event_copy(event); @@ -964,9 +964,9 @@ public class GDK extends OS { } } /** @param event cast=(GdkEvent *) */ - public static final native void _gdk_event_free(long /*int*/ event); + public static final native void _gdk_event_free(long event); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_event_free(long /*int*/ event) { + public static final void gdk_event_free(long event) { lock.lock(); try { _gdk_event_free(event); @@ -974,9 +974,9 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_event_get(); + public static final native long _gdk_event_get(); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_event_get() { + public static final long gdk_event_get() { lock.lock(); try { return _gdk_event_get(); @@ -989,8 +989,8 @@ public class GDK extends OS { * @param px cast=(gdouble *) * @param py cast=(gdouble *) */ - public static final native boolean _gdk_event_get_coords(long /*int*/ event, double[] px, double[] py); - public static final boolean gdk_event_get_coords(long /*int*/ event, double[] px, double[] py) { + public static final native boolean _gdk_event_get_coords(long event, double[] px, double[] py); + public static final boolean gdk_event_get_coords(long event, double[] px, double[] py) { lock.lock(); try { return _gdk_event_get_coords(event, px, py); @@ -1002,9 +1002,9 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param mode cast=(GdkCrossingMode *) */ - public static final native boolean _gdk_event_get_crossing_mode(long /*int*/ event, int [] mode); + public static final native boolean _gdk_event_get_crossing_mode(long event, int [] mode); /** [GTK4 only, if-def'd in os.h] */ - public static final boolean gdk_event_get_crossing_mode(long /*int*/ event, int [] mode) { + public static final boolean gdk_event_get_crossing_mode(long event, int [] mode) { lock.lock(); try { return _gdk_event_get_crossing_mode(event, mode); @@ -1016,8 +1016,8 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param button cast=(guint *) */ - public static final native boolean _gdk_event_get_button(long /*int*/ event, int[] button); - public static final boolean gdk_event_get_button(long /*int*/ event, int[] button) { + public static final native boolean _gdk_event_get_button(long event, int[] button); + public static final boolean gdk_event_get_button(long event, int[] button) { lock.lock(); try { return _gdk_event_get_button(event, button); @@ -1029,9 +1029,9 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param in cast=(gboolean *) */ - public static final native boolean _gdk_event_get_focus_in(long /*int*/ event, boolean [] in); + public static final native boolean _gdk_event_get_focus_in(long event, boolean [] in); /** [GTK4 only, if-def'd in os.h] */ - public static final boolean gdk_event_get_focus_in(long /*int*/ event, boolean [] in) { + public static final boolean gdk_event_get_focus_in(long event, boolean [] in) { lock.lock(); try { return _gdk_event_get_focus_in(event, in); @@ -1043,8 +1043,8 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param keyval cast=(guint *) */ - public static final native boolean _gdk_event_get_keyval(long /*int*/ event,int [] keyval); - public static final boolean gdk_event_get_keyval(long /*int*/ event, int [] keyval) { + public static final native boolean _gdk_event_get_keyval(long event,int [] keyval); + public static final boolean gdk_event_get_keyval(long event, int [] keyval) { lock.lock(); try { return _gdk_event_get_keyval(event, keyval); @@ -1056,8 +1056,8 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param keycode cast=(guint16 *) */ - public static final native boolean _gdk_event_get_keycode(long /*int*/ event, short [] keycode); - public static final boolean gdk_event_get_keycode(long /*int*/ event, short [] keycode) { + public static final native boolean _gdk_event_get_keycode(long event, short [] keycode); + public static final boolean gdk_event_get_keycode(long event, short [] keycode) { lock.lock(); try { return _gdk_event_get_keycode(event, keycode); @@ -1069,9 +1069,9 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param group cast=(guint *) */ - public static final native boolean _gdk_event_get_key_group(long /*int*/ event,int [] group); + public static final native boolean _gdk_event_get_key_group(long event,int [] group); /** [GTK4 only, if-def'd in os.h] */ - public static final boolean gdk_event_get_key_group(long /*int*/ event, int [] group) { + public static final boolean gdk_event_get_key_group(long event, int [] group) { lock.lock(); try { return _gdk_event_get_key_group(event, group); @@ -1084,8 +1084,8 @@ public class GDK extends OS { * @param x cast=(gdouble *) * @param y cast=(gdouble *) */ - public static final native boolean _gdk_event_get_root_coords(long /*int*/ event, double[] x, double[] y); - public static final boolean gdk_event_get_root_coords(long /*int*/ event, double[] x, double[] y) { + public static final native boolean _gdk_event_get_root_coords(long event, double[] x, double[] y); + public static final boolean gdk_event_get_root_coords(long event, double[] x, double[] y) { lock.lock(); try { return _gdk_event_get_root_coords(event, x, y); @@ -1097,8 +1097,8 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param pmod cast=(GdkModifierType *) */ - public static final native boolean _gdk_event_get_state(long /*int*/ event, int[] pmod); - public static final boolean gdk_event_get_state(long /*int*/ event, int[] pmod) { + public static final native boolean _gdk_event_get_state(long event, int[] pmod); + public static final boolean gdk_event_get_state(long event, int[] pmod) { lock.lock(); try { return _gdk_event_get_state(event, pmod); @@ -1110,9 +1110,9 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param string cast=(const char **) */ - public static final native boolean _gdk_event_get_string(long /*int*/ event, long /*int*/ [] string); + public static final native boolean _gdk_event_get_string(long event, long [] string); /** [GTK4 only, if-def'd in os.h] */ - public static final boolean gdk_event_get_string(long /*int*/ event, long /*int*/ [] string) { + public static final boolean gdk_event_get_string(long event, long [] string) { lock.lock(); try { return _gdk_event_get_string(event, string); @@ -1125,8 +1125,8 @@ public class GDK extends OS { * @param delta_x cast=(gdouble *) * @param delta_y cast=(gdouble *) */ - public static final native boolean _gdk_event_get_scroll_deltas(long /*int*/ event, double[] delta_x, double[] delta_y); - public static final boolean gdk_event_get_scroll_deltas(long /*int*/ event, double[] delta_x, double[] delta_y) { + public static final native boolean _gdk_event_get_scroll_deltas(long event, double[] delta_x, double[] delta_y); + public static final boolean gdk_event_get_scroll_deltas(long event, double[] delta_x, double[] delta_y) { lock.lock(); try { return _gdk_event_get_scroll_deltas(event, delta_x, delta_y); @@ -1138,8 +1138,8 @@ public class GDK extends OS { * @param event cast=(const GdkEvent *) * @param direction cast=(GdkScrollDirection *) */ - public static final native boolean _gdk_event_get_scroll_direction(long /*int*/ event, int [] direction); - public static final boolean gdk_event_get_scroll_direction(long /*int*/ event, int [] direction) { + public static final native boolean _gdk_event_get_scroll_direction(long event, int [] direction); + public static final boolean gdk_event_get_scroll_direction(long event, int [] direction) { lock.lock(); try { return _gdk_event_get_scroll_direction(event, direction); @@ -1150,8 +1150,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_event_get_seat(long /*int*/ event); - public static final long /*int*/ gdk_event_get_seat(long /*int*/ event) { + public static final native long _gdk_event_get_seat(long event); + public static final long gdk_event_get_seat(long event) { lock.lock(); try { return _gdk_event_get_seat(event); @@ -1162,9 +1162,9 @@ public class GDK extends OS { /** * @param event cast=(GdkEvent *) */ - public static final native long /*int*/ _gdk_event_get_surface(long /*int*/ event); + public static final native long _gdk_event_get_surface(long event); /** [GTK4 only, if-def'd in os.h] **/ - public static final long /*int*/ gdk_event_get_surface(long /*int*/ event) { + public static final long gdk_event_get_surface(long event) { lock.lock(); try { return _gdk_event_get_surface(event); @@ -1175,9 +1175,9 @@ public class GDK extends OS { /** * @param event cast=(GdkEvent *) */ - public static final native long /*int*/ _gdk_event_get_window(long /*int*/ event); + public static final native long _gdk_event_get_window(long event); /** [GTK3 only, if-def'd in os.h] **/ - public static final long /*int*/ gdk_event_get_window(long /*int*/ event) { + public static final long gdk_event_get_window(long event) { lock.lock(); try { return _gdk_event_get_window(event); @@ -1186,8 +1186,8 @@ public class GDK extends OS { } } /** @param event cast=(GdkEvent *) */ - public static final native int _gdk_event_get_time(long /*int*/ event); - public static final int gdk_event_get_time(long /*int*/ event) { + public static final native int _gdk_event_get_time(long event); + public static final int gdk_event_get_time(long event) { lock.lock(); try { return _gdk_event_get_time(event); @@ -1199,9 +1199,9 @@ public class GDK extends OS { * @method flags=dynamic * @param event cast=(GdkEvent *) */ - public static final native int _gdk_event_get_event_type(long /*int*/ event); + public static final native int _gdk_event_get_event_type(long event); /** [GTK3.10+] */ - public static final int gdk_event_get_event_type(long /*int*/ event) { + public static final int gdk_event_get_event_type(long event) { lock.lock(); try { return _gdk_event_get_event_type(event); @@ -1214,8 +1214,8 @@ public class GDK extends OS { * @param data cast=(gpointer) * @param notify cast=(GDestroyNotify) */ - public static final native void _gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify); - public static final void gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify) { + public static final native void _gdk_event_handler_set(long func, long data, long notify); + public static final void gdk_event_handler_set(long func, long data, long notify) { lock.lock(); try { _gdk_event_handler_set(func, data, notify); @@ -1223,8 +1223,8 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_event_new(int type); - public static final long /*int*/ gdk_event_new(int type) { + public static final native long _gdk_event_new(int type); + public static final long gdk_event_new(int type) { lock.lock(); try { return _gdk_event_new(type); @@ -1232,9 +1232,9 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_event_peek(); + public static final native long _gdk_event_peek(); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_event_peek() { + public static final long gdk_event_peek() { lock.lock(); try { return _gdk_event_peek(); @@ -1246,8 +1246,8 @@ public class GDK extends OS { * @param event cast=(GdkEvent *) * @param device cast=(GdkDevice *) */ - public static final native void _gdk_event_set_device(long /*int*/ event, long /*int*/ device); - public static final void gdk_event_set_device(long /*int*/ event, long /*int*/ device) { + public static final native void _gdk_event_set_device(long event, long device); + public static final void gdk_event_set_device(long event, long device) { lock.lock(); try { _gdk_event_set_device(event, device); @@ -1256,9 +1256,9 @@ public class GDK extends OS { } } /** @param event cast=(GdkEvent *) */ - public static final native void _gdk_event_put(long /*int*/ event); + public static final native void _gdk_event_put(long event); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_event_put(long /*int*/ event) { + public static final void gdk_event_put(long event) { lock.lock(); try { _gdk_event_put(event); @@ -1269,8 +1269,8 @@ public class GDK extends OS { /** * @param display cast=(GdkDisplay *) */ - public static final native void _gdk_x11_display_error_trap_push(long /*int*/ display); - public static final void gdk_x11_display_error_trap_push(long /*int*/ display) { + public static final native void _gdk_x11_display_error_trap_push(long display); + public static final void gdk_x11_display_error_trap_push(long display) { lock.lock(); try { _gdk_x11_display_error_trap_push(display); @@ -1281,8 +1281,8 @@ public class GDK extends OS { /** * @param display cast=(GdkDisplay *) */ - public static final native void _gdk_x11_display_error_trap_pop_ignored(long /*int*/ display); - public static final void gdk_x11_display_error_trap_pop_ignored(long /*int*/ display) { + public static final native void _gdk_x11_display_error_trap_pop_ignored(long display); + public static final void gdk_x11_display_error_trap_pop_ignored(long display) { lock.lock(); try { _gdk_x11_display_error_trap_pop_ignored(display); @@ -1290,9 +1290,9 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_get_default_root_window(); + public static final native long _gdk_get_default_root_window(); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_get_default_root_window() { + public static final long gdk_get_default_root_window() { lock.lock(); try { return _gdk_get_default_root_window(); @@ -1304,9 +1304,9 @@ public class GDK extends OS { * @method flags=dynamic * @param display cast=(GdkDisplay *) */ - public static final native long /*int*/ _gdk_keymap_get_for_display(long /*int*/ display); + public static final native long _gdk_keymap_get_for_display(long display); /** [GTK3 only] */ - public static final long /*int*/ gdk_keymap_get_for_display(long /*int*/ display) { + public static final long gdk_keymap_get_for_display(long display) { lock.lock(); try { return _gdk_keymap_get_for_display(display); @@ -1317,9 +1317,9 @@ public class GDK extends OS { /** * @param display cast=(GdkDisplay *) */ - public static final native long /*int*/ _gdk_display_get_keymap(long /*int*/ display); + public static final native long _gdk_display_get_keymap(long display); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_display_get_keymap(long /*int*/ display) { + public static final long gdk_display_get_keymap(long display) { lock.lock(); try { return _gdk_display_get_keymap(display); @@ -1337,8 +1337,8 @@ public class GDK extends OS { * @param level cast=(gint *) * @param consumed_modifiers cast=(GdkModifierType *) */ - public static final native boolean _gdk_keymap_translate_keyboard_state (long /*int*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers); - public static final boolean gdk_keymap_translate_keyboard_state (long /*int*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers) { + public static final native boolean _gdk_keymap_translate_keyboard_state (long keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers); + public static final boolean gdk_keymap_translate_keyboard_state (long keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers) { lock.lock(); try { return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers); @@ -1352,8 +1352,8 @@ public class GDK extends OS { * @param keys cast=(GdkKeymapKey**) * @param n_keys cast=(gint*) */ - public static final native boolean _gdk_keymap_get_entries_for_keyval (long /*int*/ keymap, int keyval, long /*int*/ [] keys, int[] n_keys); - public static final boolean gdk_keymap_get_entries_for_keyval (long /*int*/ keymap, int keyval, long /*int*/ [] keys, int[] n_keys) { + public static final native boolean _gdk_keymap_get_entries_for_keyval (long keymap, int keyval, long [] keys, int[] n_keys); + public static final boolean gdk_keymap_get_entries_for_keyval (long keymap, int keyval, long [] keys, int[] n_keys) { lock.lock(); try { return _gdk_keymap_get_entries_for_keyval(keymap, keyval, keys, n_keys); @@ -1382,9 +1382,9 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_pango_context_get(); + public static final native long _gdk_pango_context_get(); /** [GTK3 only] */ - public static final long /*int*/ gdk_pango_context_get() { + public static final long gdk_pango_context_get() { lock.lock(); try { return _gdk_pango_context_get(); @@ -1396,8 +1396,8 @@ public class GDK extends OS { * @param layout cast=(PangoLayout *) * @param index_ranges cast=(gint *) */ - public static final native long /*int*/ _gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges); - public static final long /*int*/ gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) { + public static final native long _gdk_pango_layout_get_clip_region(long layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges); + public static final long gdk_pango_layout_get_clip_region(long layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) { lock.lock(); try { return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges); @@ -1409,8 +1409,8 @@ public class GDK extends OS { * @param src_pixbuf cast=(GdkPixbuf *) * @param dest_pixbuf cast=(GdkPixbuf *) */ - public static final native void _gdk_pixbuf_copy_area(long /*int*/ src_pixbuf, int src_x, int src_y, int width, int height, long /*int*/ dest_pixbuf, int dest_x, int dest_y); - public static final void gdk_pixbuf_copy_area(long /*int*/ src_pixbuf, int src_x, int src_y, int width, int height, long /*int*/ dest_pixbuf, int dest_x, int dest_y) { + public static final native void _gdk_pixbuf_copy_area(long src_pixbuf, int src_x, int src_y, int width, int height, long dest_pixbuf, int dest_x, int dest_y); + public static final void gdk_pixbuf_copy_area(long src_pixbuf, int src_x, int src_y, int width, int height, long dest_pixbuf, int dest_x, int dest_y) { lock.lock(); try { _gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y); @@ -1419,8 +1419,8 @@ public class GDK extends OS { } } /** @param pixbuf cast=(const GdkPixbuf *) */ - public static final native boolean _gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf); - public static final boolean gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf) { + public static final native boolean _gdk_pixbuf_get_has_alpha(long pixbuf); + public static final boolean gdk_pixbuf_get_has_alpha(long pixbuf) { lock.lock(); try { return _gdk_pixbuf_get_has_alpha(pixbuf); @@ -1429,8 +1429,8 @@ public class GDK extends OS { } } /** @param pixbuf cast=(const GdkPixbuf *) */ - public static final native int _gdk_pixbuf_get_height(long /*int*/ pixbuf); - public static final int gdk_pixbuf_get_height(long /*int*/ pixbuf) { + public static final native int _gdk_pixbuf_get_height(long pixbuf); + public static final int gdk_pixbuf_get_height(long pixbuf) { lock.lock(); try { return _gdk_pixbuf_get_height(pixbuf); @@ -1439,8 +1439,8 @@ public class GDK extends OS { } } /** @param pixbuf cast=(const GdkPixbuf *) */ - public static final native long /*int*/ _gdk_pixbuf_get_pixels(long /*int*/ pixbuf); - public static final long /*int*/ gdk_pixbuf_get_pixels(long /*int*/ pixbuf) { + public static final native long _gdk_pixbuf_get_pixels(long pixbuf); + public static final long gdk_pixbuf_get_pixels(long pixbuf) { lock.lock(); try { return _gdk_pixbuf_get_pixels(pixbuf); @@ -1449,8 +1449,8 @@ public class GDK extends OS { } } /** @param pixbuf cast=(const GdkPixbuf *) */ - public static final native int _gdk_pixbuf_get_rowstride(long /*int*/ pixbuf); - public static final int gdk_pixbuf_get_rowstride(long /*int*/ pixbuf) { + public static final native int _gdk_pixbuf_get_rowstride(long pixbuf); + public static final int gdk_pixbuf_get_rowstride(long pixbuf) { lock.lock(); try { return _gdk_pixbuf_get_rowstride(pixbuf); @@ -1459,8 +1459,8 @@ public class GDK extends OS { } } /** @param pixbuf cast=(const GdkPixbuf *) */ - public static final native int _gdk_pixbuf_get_width(long /*int*/ pixbuf); - public static final int gdk_pixbuf_get_width(long /*int*/ pixbuf) { + public static final native int _gdk_pixbuf_get_width(long pixbuf); + public static final int gdk_pixbuf_get_width(long pixbuf) { lock.lock(); try { return _gdk_pixbuf_get_width(pixbuf); @@ -1468,8 +1468,8 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_pixbuf_loader_new(); - public static final long /*int*/ gdk_pixbuf_loader_new() { + public static final native long _gdk_pixbuf_loader_new(); + public static final long gdk_pixbuf_loader_new() { lock.lock(); try { return _gdk_pixbuf_loader_new(); @@ -1481,8 +1481,8 @@ public class GDK extends OS { * @param loader cast=(GdkPixbufLoader *) * @param error cast=(GError **) */ - public static final native boolean _gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error); - public static final boolean gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error) { + public static final native boolean _gdk_pixbuf_loader_close(long loader, long [] error); + public static final boolean gdk_pixbuf_loader_close(long loader, long [] error) { lock.lock(); try { return _gdk_pixbuf_loader_close(loader, error); @@ -1491,8 +1491,8 @@ public class GDK extends OS { } } /** @param loader cast=(GdkPixbufLoader *) */ - public static final native long /*int*/ _gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader); - public static final long /*int*/ gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader) { + public static final native long _gdk_pixbuf_loader_get_pixbuf(long loader); + public static final long gdk_pixbuf_loader_get_pixbuf(long loader) { lock.lock(); try { return _gdk_pixbuf_loader_get_pixbuf(loader); @@ -1506,8 +1506,8 @@ public class GDK extends OS { * @param count cast=(gsize) * @param error cast=(GError **) */ - public static final native boolean _gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error); - public static final boolean gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error) { + public static final native boolean _gdk_pixbuf_loader_write(long loader, long buffer, int count, long [] error); + public static final boolean gdk_pixbuf_loader_write(long loader, long buffer, int count, long [] error) { lock.lock(); try { return _gdk_pixbuf_loader_write(loader, buffer, count, error); @@ -1519,8 +1519,8 @@ public class GDK extends OS { * @param colorspace cast=(GdkColorspace) * @param has_alpha cast=(gboolean) */ - public static final native long /*int*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height); - public static final long /*int*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) { + public static final native long _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height); + public static final long gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) { lock.lock(); try { return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height); @@ -1532,8 +1532,8 @@ public class GDK extends OS { * @param filename cast=(const char *) * @param error cast=(GError**) */ - public static final native long /*int*/ _gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error); - public static final long /*int*/ gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error) { + public static final native long _gdk_pixbuf_new_from_file(byte[] filename, long [] error); + public static final long gdk_pixbuf_new_from_file(byte[] filename, long [] error) { lock.lock(); try { return _gdk_pixbuf_new_from_file(filename, error); @@ -1550,8 +1550,8 @@ public class GDK extends OS { * @param option_values cast=(char **) * @param error cast=(GError **) */ - public static final native boolean _gdk_pixbuf_save_to_bufferv(long /*int*/ pixbuf, long /*int*/ [] buffer, long /*int*/ [] buffer_size, byte [] type, long /*int*/ [] option_keys, long /*int*/ [] option_values, long /*int*/ [] error); - public static final boolean gdk_pixbuf_save_to_bufferv(long /*int*/ pixbuf, long /*int*/ [] buffer, long /*int*/ [] buffer_size, byte [] type, long /*int*/ [] option_keys, long /*int*/ [] option_values, long /*int*/ [] error) { + public static final native boolean _gdk_pixbuf_save_to_bufferv(long pixbuf, long [] buffer, long [] buffer_size, byte [] type, long [] option_keys, long [] option_values, long [] error); + public static final boolean gdk_pixbuf_save_to_bufferv(long pixbuf, long [] buffer, long [] buffer_size, byte [] type, long [] option_keys, long [] option_values, long [] error) { lock.lock(); try { return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error); @@ -1563,8 +1563,8 @@ public class GDK extends OS { * @param src cast=(const GdkPixbuf *) * @param interp_type cast=(GdkInterpType) */ - public static final native long /*int*/ _gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type); - public static final long /*int*/ gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type) { + public static final native long _gdk_pixbuf_scale_simple(long src, int dest_width, int dest_height, int interp_type); + public static final long gdk_pixbuf_scale_simple(long src, int dest_width, int dest_height, int interp_type) { lock.lock(); try { return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type); @@ -1581,9 +1581,9 @@ public class GDK extends OS { * @param cursor cast=(GdkCursor *) * @param time_ cast=(guint32) */ - public static final native int _gdk_device_grab(long /*int*/ device, long /*int*/ window, int grab_ownership, boolean owner_events, int event_mask, long /*int*/ cursor, int time_); + public static final native int _gdk_device_grab(long device, long window, int grab_ownership, boolean owner_events, int event_mask, long cursor, int time_); /** [GTK3 only, if-def'd in os.h; 3.20 deprecated, replaced] */ - public static final int gdk_device_grab(long /*int*/ device, long /*int*/ window, int grab_ownership, boolean owner_events, int event_mask, long /*int*/ cursor, int time_) { + public static final int gdk_device_grab(long device, long window, int grab_ownership, boolean owner_events, int event_mask, long cursor, int time_) { lock.lock(); try { return _gdk_device_grab(device, window, grab_ownership, owner_events, event_mask, cursor,time_); @@ -1596,9 +1596,9 @@ public class GDK extends OS { * @param device cast=(GdkDevice *) * @param time_ cast=(guint32) */ - public static final native void _gdk_device_ungrab(long /*int*/ device, int time_); + public static final native void _gdk_device_ungrab(long device, int time_); /** [GTK3; 3.20 deprecated] */ - public static final void gdk_device_ungrab(long /*int*/ device, int time_) { + public static final void gdk_device_ungrab(long device, int time_) { lock.lock(); try { _gdk_device_ungrab(device, time_); @@ -1609,8 +1609,8 @@ public class GDK extends OS { /** * @param device cast=(GdkDevice *) */ - public static final native long /*int*/ _gdk_device_get_associated_device(long /*int*/ device); - public static final long /*int*/ gdk_device_get_associated_device(long /*int*/ device) { + public static final native long _gdk_device_get_associated_device(long device); + public static final long gdk_device_get_associated_device(long device) { lock.lock(); try { return _gdk_device_get_associated_device(device); @@ -1622,8 +1622,8 @@ public class GDK extends OS { * @method flags=dynamic * @param device cast=(GdkDevice *) */ - public static final native long /*int*/ _gdk_device_get_seat(long /*int*/ device); - public static final long /*int*/ gdk_device_get_seat(long /*int*/ device) { + public static final native long _gdk_device_get_seat(long device); + public static final long gdk_device_get_seat(long device) { lock.lock(); try { return _gdk_device_get_seat(device); @@ -1640,9 +1640,9 @@ public class GDK extends OS { * @param actual_length cast=(gint *) * @param data cast=(guchar **) */ - public static final native boolean _gdk_property_get(long /*int*/ window, long /*int*/ property, long /*int*/ type, long /*int*/ offset, long /*int*/ length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data); + public static final native boolean _gdk_property_get(long window, long property, long type, long offset, long length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gdk_property_get(long /*int*/ window, long /*int*/ property, long /*int*/ type, long /*int*/ offset, long /*int*/ length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data) { + public static final boolean gdk_property_get(long window, long property, long type, long offset, long length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data) { lock.lock(); try { return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data); @@ -1653,8 +1653,8 @@ public class GDK extends OS { /** * @param surface cast=(cairo_surface_t *) */ - public static final native long /*int*/ _gdk_cairo_region_create_from_surface(long /*int*/ surface); - public static final long /*int*/ gdk_cairo_region_create_from_surface(long /*int*/ surface) { + public static final native long _gdk_cairo_region_create_from_surface(long surface); + public static final long gdk_cairo_region_create_from_surface(long surface) { lock.lock(); try { return _gdk_cairo_region_create_from_surface(surface); @@ -1665,8 +1665,8 @@ public class GDK extends OS { /** * @param rgba cast=(GdkRGBA *) */ - public static final native long /*int*/ _gdk_rgba_to_string(GdkRGBA rgba); - public static final long /*int*/ gdk_rgba_to_string(GdkRGBA rgba) { + public static final native long _gdk_rgba_to_string(GdkRGBA rgba); + public static final long gdk_rgba_to_string(GdkRGBA rgba) { lock.lock(); try { return _gdk_rgba_to_string(rgba); @@ -1677,8 +1677,8 @@ public class GDK extends OS { /** * @param rgba cast=(GdkRGBA *) */ - public static final native void _gdk_rgba_free(long /*int*/ rgba); - public static final void gdk_rgba_free(long /*int*/ rgba) { + public static final native void _gdk_rgba_free(long rgba); + public static final void gdk_rgba_free(long rgba) { lock.lock(); try { _gdk_rgba_free(rgba); @@ -1702,8 +1702,8 @@ public class GDK extends OS { * @param rgba cast=(GdkRGBA *) * @param property cast=(const gchar *) */ - public static final native long /*int*/ _gdk_rgba_parse(GdkRGBA rgba, byte[] property); - public static final long /*int*/ gdk_rgba_parse(GdkRGBA rgba, byte[] property) { + public static final native long _gdk_rgba_parse(GdkRGBA rgba, byte[] property); + public static final long gdk_rgba_parse(GdkRGBA rgba, byte[] property) { lock.lock(); try { return _gdk_rgba_parse(rgba, property); @@ -1711,9 +1711,9 @@ public class GDK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gdk_screen_get_default(); + public static final native long _gdk_screen_get_default(); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_screen_get_default() { + public static final long gdk_screen_get_default() { lock.lock(); try { return _gdk_screen_get_default(); @@ -1724,9 +1724,9 @@ public class GDK extends OS { /** * @param screen cast=(GdkScreen *) */ - public static final native double _gdk_screen_get_resolution(long /*int*/ screen); + public static final native double _gdk_screen_get_resolution(long screen); /** [GTK3 only, if-def'd in os.h] */ - public static final double gdk_screen_get_resolution(long /*int*/ screen) { + public static final double gdk_screen_get_resolution(long screen) { lock.lock(); try { return _gdk_screen_get_resolution(screen); @@ -1739,9 +1739,9 @@ public class GDK extends OS { * @param screen cast=(GdkScreen *) * @param monitor_num cast=(gint) */ - public static final native int _gdk_screen_get_monitor_scale_factor(long /*int*/ screen, int monitor_num); + public static final native int _gdk_screen_get_monitor_scale_factor(long screen, int monitor_num); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final int gdk_screen_get_monitor_scale_factor(long /*int*/ screen, int monitor_num) { + public static final int gdk_screen_get_monitor_scale_factor(long screen, int monitor_num) { lock.lock(); try { return _gdk_screen_get_monitor_scale_factor(screen, monitor_num); @@ -1752,8 +1752,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native int _gdk_monitor_get_scale_factor(long /*int*/ window); - public static final int gdk_monitor_get_scale_factor(long /*int*/ window) { + public static final native int _gdk_monitor_get_scale_factor(long window); + public static final int gdk_monitor_get_scale_factor(long window) { lock.lock(); try { return _gdk_monitor_get_scale_factor(window); @@ -1767,9 +1767,9 @@ public class GDK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native int _gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y); + public static final native int _gdk_screen_get_monitor_at_point (long screen, int x, int y); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final int gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y) { + public static final int gdk_screen_get_monitor_at_point (long screen, int x, int y) { lock.lock(); try { return _gdk_screen_get_monitor_at_point (screen, x, y); @@ -1782,9 +1782,9 @@ public class GDK extends OS { * @param screen cast=(GdkScreen *) * @param window cast=(GdkWindow *) */ - public static final native int _gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window); + public static final native int _gdk_screen_get_monitor_at_window(long screen, long window); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final int gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window) { + public static final int gdk_screen_get_monitor_at_window(long screen, long window) { lock.lock(); try { return _gdk_screen_get_monitor_at_window(screen, window); @@ -1795,8 +1795,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_display_get_monitor(long /*int*/ display, int monitor_num); - public static final long /*int*/ gdk_display_get_monitor(long /*int*/ display, int monitor_num) { + public static final native long _gdk_display_get_monitor(long display, int monitor_num); + public static final long gdk_display_get_monitor(long display, int monitor_num) { lock.lock(); try { return _gdk_display_get_monitor(display, monitor_num); @@ -1807,8 +1807,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_display_get_monitor_at_point(long /*int*/ display, int x, int y); - public static final long /*int*/ gdk_display_get_monitor_at_point(long /*int*/ display, int x, int y) { + public static final native long _gdk_display_get_monitor_at_point(long display, int x, int y); + public static final long gdk_display_get_monitor_at_point(long display, int x, int y) { lock.lock(); try { return _gdk_display_get_monitor_at_point(display, x, y); @@ -1821,9 +1821,9 @@ public class GDK extends OS { * @param display cast=(GdkDisplay *) * @param window cast=(GdkWindow *) */ - public static final native long /*int*/ _gdk_display_get_monitor_at_window(long /*int*/ display, long /*int*/ window); + public static final native long _gdk_display_get_monitor_at_window(long display, long window); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_display_get_monitor_at_window(long /*int*/ display, long /*int*/ window) { + public static final long gdk_display_get_monitor_at_window(long display, long window) { lock.lock(); try { return _gdk_display_get_monitor_at_window(display, window); @@ -1835,9 +1835,9 @@ public class GDK extends OS { * @param display cast=(GdkDisplay *) * @param surface cast=(GdkSurface *) */ - public static final native long /*int*/ _gdk_display_get_monitor_at_surface(long /*int*/ display, long /*int*/ surface); + public static final native long _gdk_display_get_monitor_at_surface(long display, long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_display_get_monitor_at_surface(long /*int*/ display, long /*int*/ surface) { + public static final long gdk_display_get_monitor_at_surface(long display, long surface) { lock.lock(); try { return _gdk_display_get_monitor_at_surface(display, surface); @@ -1848,8 +1848,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native int _gdk_display_get_n_monitors(long /*int*/ display); - public static final int gdk_display_get_n_monitors(long /*int*/ display) { + public static final native int _gdk_display_get_n_monitors(long display); + public static final int gdk_display_get_n_monitors(long display) { lock.lock(); try { return _gdk_display_get_n_monitors(display); @@ -1860,8 +1860,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native int _gdk_monitor_get_width_mm(long /*int*/ monitor); - public static final int gdk_monitor_get_width_mm(long /*int*/ monitor) { + public static final native int _gdk_monitor_get_width_mm(long monitor); + public static final int gdk_monitor_get_width_mm(long monitor) { lock.lock(); try { return _gdk_monitor_get_width_mm(monitor); @@ -1872,8 +1872,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_display_get_primary_monitor(long /*int*/ display); - public static final long /*int*/ gdk_display_get_primary_monitor(long /*int*/ display) { + public static final native long _gdk_display_get_primary_monitor(long display); + public static final long gdk_display_get_primary_monitor(long display) { lock.lock(); try { return _gdk_display_get_primary_monitor(display); @@ -1895,8 +1895,8 @@ public class GDK extends OS { } } /** @param display cast=(GdkDisplay *) */ - public static final native long /*int*/ _gdk_display_peek_event(long /*int*/ display); - public static final long /*int*/ gdk_display_peek_event(long /*int*/ display) { + public static final native long _gdk_display_peek_event(long display); + public static final long gdk_display_peek_event(long display) { lock.lock(); try { return _gdk_display_peek_event(display); @@ -1922,9 +1922,9 @@ public class GDK extends OS { * @param screen cast=(GdkScreen *) * @param dest flags=no_in */ - public static final native void _gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest); + public static final native void _gdk_screen_get_monitor_geometry (long screen, int monitor_num, GdkRectangle dest); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final void gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest) { + public static final void gdk_screen_get_monitor_geometry (long screen, int monitor_num, GdkRectangle dest) { lock.lock(); try { _gdk_screen_get_monitor_geometry(screen, monitor_num, dest); @@ -1936,8 +1936,8 @@ public class GDK extends OS { * @method flags=dynamic * @param dest flags=no_in */ - public static final native void _gdk_monitor_get_geometry (long /*int*/ monitor, GdkRectangle dest); - public static final void gdk_monitor_get_geometry (long /*int*/ monitor, GdkRectangle dest) { + public static final native void _gdk_monitor_get_geometry (long monitor, GdkRectangle dest); + public static final void gdk_monitor_get_geometry (long monitor, GdkRectangle dest) { lock.lock(); try { _gdk_monitor_get_geometry(monitor, dest); @@ -1949,8 +1949,8 @@ public class GDK extends OS { * @method flags=dynamic * @param dest flags=no_in */ - public static final native void _gdk_monitor_get_workarea (long /*int*/ monitor, GdkRectangle dest); - public static final void gdk_monitor_get_workarea (long /*int*/ monitor, GdkRectangle dest) { + public static final native void _gdk_monitor_get_workarea (long monitor, GdkRectangle dest); + public static final void gdk_monitor_get_workarea (long monitor, GdkRectangle dest) { lock.lock(); try { _gdk_monitor_get_workarea(monitor, dest); @@ -1963,9 +1963,9 @@ public class GDK extends OS { * @param screen cast=(GdkScreen *) * @param dest flags=no_in */ - public static final native void _gdk_screen_get_monitor_workarea (long /*int*/ screen, int monitor_num, GdkRectangle dest); + public static final native void _gdk_screen_get_monitor_workarea (long screen, int monitor_num, GdkRectangle dest); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final void gdk_screen_get_monitor_workarea (long /*int*/ screen, int monitor_num, GdkRectangle dest) { + public static final void gdk_screen_get_monitor_workarea (long screen, int monitor_num, GdkRectangle dest) { lock.lock(); try { _gdk_screen_get_monitor_workarea(screen, monitor_num, dest); @@ -1977,9 +1977,9 @@ public class GDK extends OS { * @method flags=dynamic * @param screen cast=(GdkScreen *) */ - public static final native int _gdk_screen_get_n_monitors(long /*int*/ screen); + public static final native int _gdk_screen_get_n_monitors(long screen); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final int gdk_screen_get_n_monitors(long /*int*/ screen) { + public static final int gdk_screen_get_n_monitors(long screen) { lock.lock(); try { return _gdk_screen_get_n_monitors(screen); @@ -1991,9 +1991,9 @@ public class GDK extends OS { * @method flags=dynamic * @param screen cast=(GdkScreen *) */ - public static final native int _gdk_screen_get_primary_monitor(long /*int*/ screen); + public static final native int _gdk_screen_get_primary_monitor(long screen); /** [GTK3 only, if-def'd in os.h; 3.22 deprecated, replaced] */ - public static final int gdk_screen_get_primary_monitor(long /*int*/ screen) { + public static final int gdk_screen_get_primary_monitor(long screen) { lock.lock(); try { return _gdk_screen_get_primary_monitor(screen); @@ -2004,9 +2004,9 @@ public class GDK extends OS { /** * @param screen cast=(GdkScreen *) */ - public static final native long /*int*/ _gdk_screen_get_system_visual(long /*int*/ screen); + public static final native long _gdk_screen_get_system_visual(long screen); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_screen_get_system_visual(long /*int*/ screen) { + public static final long gdk_screen_get_system_visual(long screen) { lock.lock(); try { return _gdk_screen_get_system_visual(screen); @@ -2029,9 +2029,9 @@ public class GDK extends OS { /** * @param screen cast=(GdkScreen *) */ - public static final native boolean _gdk_screen_is_composited(long /*int*/ screen); + public static final native boolean _gdk_screen_is_composited(long screen); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gdk_screen_is_composited(long /*int*/ screen) { + public static final boolean gdk_screen_is_composited(long screen) { lock.lock(); try { return _gdk_screen_is_composited(screen); @@ -2054,8 +2054,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native int _gdk_seat_grab(long /*int*/ seat, long /*int*/ window, int capabilities, boolean owner_events, long /*int*/ cursor, long /*int*/ event, long /*int*/ func, long /*int*/ func_data); - public static final int gdk_seat_grab(long /*int*/ seat, long /*int*/ window, int capabilities, boolean owner_events, long /*int*/ cursor, long /*int*/ event, long /*int*/ func, long /*int*/ func_data) { + public static final native int _gdk_seat_grab(long seat, long window, int capabilities, boolean owner_events, long cursor, long event, long func, long func_data); + public static final int gdk_seat_grab(long seat, long window, int capabilities, boolean owner_events, long cursor, long event, long func, long func_data) { lock.lock(); try { return _gdk_seat_grab(seat, window, capabilities, owner_events, cursor, event, func, func_data); @@ -2066,8 +2066,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native void _gdk_seat_ungrab(long /*int*/ seat); - public static final void gdk_seat_ungrab(long /*int*/ seat) { + public static final native void _gdk_seat_ungrab(long seat); + public static final void gdk_seat_ungrab(long seat) { lock.lock(); try { _gdk_seat_ungrab(seat); @@ -2078,8 +2078,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_seat_get_pointer(long /*int*/ seat); - public static final long /*int*/ gdk_seat_get_pointer(long /*int*/ seat) { + public static final native long _gdk_seat_get_pointer(long seat); + public static final long gdk_seat_get_pointer(long seat) { lock.lock(); try { return _gdk_seat_get_pointer(seat); @@ -2090,8 +2090,8 @@ public class GDK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gdk_seat_get_keyboard(long /*int*/ seat); - public static final long /*int*/ gdk_seat_get_keyboard(long /*int*/ seat) { + public static final native long _gdk_seat_get_keyboard(long seat); + public static final long gdk_seat_get_keyboard(long seat) { lock.lock(); try { return _gdk_seat_get_keyboard(seat); @@ -2114,9 +2114,9 @@ public class GDK extends OS { } } /** @param atom cast=(GdkAtom) */ - public static final native void _gdk_selection_owner_get(long /*int*/ atom); + public static final native void _gdk_selection_owner_get(long atom); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_selection_owner_get(long /*int*/ atom) { + public static final void gdk_selection_owner_get(long atom) { lock.lock(); try { _gdk_selection_owner_get(atom); @@ -2130,9 +2130,9 @@ public class GDK extends OS { * @param time cast=(guint32) * @param send_event cast=(gboolean) */ - public static final native void _gdk_selection_owner_set(long /*int*/ owner, long /*int*/ atom, int time, boolean send_event); + public static final native void _gdk_selection_owner_set(long owner, long atom, int time, boolean send_event); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_selection_owner_set(long /*int*/ owner, long /*int*/ atom, int time, boolean send_event) { + public static final void gdk_selection_owner_set(long owner, long atom, int time, boolean send_event) { lock.lock(); try { _gdk_selection_owner_set(owner, atom, time, send_event); @@ -2148,8 +2148,8 @@ public class GDK extends OS { * @param ctext cast=(guchar **) * @param length cast=(gint *) */ - public static final native boolean _gdk_x11_display_utf8_to_compound_text(long /*int*/ display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length); - public static final boolean gdk_x11_display_utf8_to_compound_text(long /*int*/ display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length) { + public static final native boolean _gdk_x11_display_utf8_to_compound_text(long display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length); + public static final boolean gdk_x11_display_utf8_to_compound_text(long display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length) { lock.lock(); try { return _gdk_x11_display_utf8_to_compound_text(display, str, encoding, format, ctext, length); @@ -2158,8 +2158,8 @@ public class GDK extends OS { } } /** @param str cast=(const gchar *) */ - public static final native long /*int*/ _gdk_utf8_to_string_target(byte[] str); - public static final long /*int*/ gdk_utf8_to_string_target(byte[] str) { + public static final native long _gdk_utf8_to_string_target(byte[] str); + public static final long gdk_utf8_to_string_target(byte[] str) { lock.lock(); try { return _gdk_utf8_to_string_target(str); @@ -2173,8 +2173,8 @@ public class GDK extends OS { * @param text cast=(guchar *) * @param list cast=(gchar ***) */ - public static final native int _gdk_text_property_to_utf8_list_for_display (long /*int*/ display, long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list); - public static final int gdk_text_property_to_utf8_list_for_display (long /*int*/ display, long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list) { + public static final native int _gdk_text_property_to_utf8_list_for_display (long display, long encoding, int format, long text, int length, long /*int*/[] list); + public static final int gdk_text_property_to_utf8_list_for_display (long display, long encoding, int format, long text, int length, long /*int*/[] list) { lock.lock(); try { return _gdk_text_property_to_utf8_list_for_display(display, encoding, format, text, length, list); @@ -2185,9 +2185,9 @@ public class GDK extends OS { /** * @param pixbuf cast=(GdkPixbuf *) */ - public static final native long /*int*/ _gdk_texture_new_for_pixbuf (long /*int*/ pixbuf); + public static final native long _gdk_texture_new_for_pixbuf (long pixbuf); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_texture_new_for_pixbuf (long /*int*/ pixbuf) { + public static final long gdk_texture_new_for_pixbuf (long pixbuf) { lock.lock(); try { return _gdk_texture_new_for_pixbuf(pixbuf); @@ -2208,9 +2208,9 @@ public class GDK extends OS { /** * @param visual cast=(GdkVisual *) */ - public static final native int _gdk_visual_get_depth(long /*int*/ visual); + public static final native int _gdk_visual_get_depth(long visual); /** [GTK3 only, if-def'd in os.h] */ - public static final int gdk_visual_get_depth(long /*int*/ visual) { + public static final int gdk_visual_get_depth(long visual) { lock.lock(); try { return _gdk_visual_get_depth(visual); @@ -2222,9 +2222,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param content cast=(cairo_content_t) */ - public static final native long /*int*/ _gdk_window_create_similar_surface(long /*int*/ window, int content, int width, int height); + public static final native long _gdk_window_create_similar_surface(long window, int content, int width, int height); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_window_create_similar_surface(long /*int*/ window, int content, int width, int height) { + public static final long gdk_window_create_similar_surface(long window, int content, int width, int height) { lock.lock(); try { return _gdk_window_create_similar_surface(window, content, width, height); @@ -2236,9 +2236,9 @@ public class GDK extends OS { * @param window cast=(GdkSurface *) * @param content cast=(cairo_content_t) */ - public static final native long /*int*/ _gdk_surface_create_similar_surface(long /*int*/ window, int content, int width, int height); + public static final native long _gdk_surface_create_similar_surface(long window, int content, int width, int height); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_surface_create_similar_surface(long /*int*/ window, int content, int width, int height) { + public static final long gdk_surface_create_similar_surface(long window, int content, int width, int height) { lock.lock(); try { return _gdk_surface_create_similar_surface(window, content, width, height); @@ -2247,9 +2247,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_destroy(long /*int*/ window); + public static final native void _gdk_window_destroy(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_destroy(long /*int*/ window) { + public static final void gdk_window_destroy(long window) { lock.lock(); try { _gdk_window_destroy(window); @@ -2258,9 +2258,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkSurface *) */ - public static final native void _gdk_surface_destroy(long /*int*/ window); + public static final native void _gdk_surface_destroy(long window); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_destroy(long /*int*/ window) { + public static final void gdk_surface_destroy(long window) { lock.lock(); try { _gdk_surface_destroy(window); @@ -2269,9 +2269,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native long /*int*/ _gdk_window_get_children(long /*int*/ window); + public static final native long _gdk_window_get_children(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_window_get_children(long /*int*/ window) { + public static final long gdk_window_get_children(long window) { lock.lock(); try { return _gdk_window_get_children(window); @@ -2280,9 +2280,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native long /*int*/ _gdk_surface_get_children(long /*int*/ surface); + public static final native long _gdk_surface_get_children(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_surface_get_children(long /*int*/ surface) { + public static final long gdk_surface_get_children(long surface) { lock.lock(); try { return _gdk_surface_get_children(surface); @@ -2291,9 +2291,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native int _gdk_window_get_events(long /*int*/ window); + public static final native int _gdk_window_get_events(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final int gdk_window_get_events(long /*int*/ window) { + public static final int gdk_window_get_events(long window) { lock.lock(); try { return _gdk_window_get_events(window); @@ -2302,9 +2302,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_focus(long /*int*/ window, int timestamp); + public static final native void _gdk_window_focus(long window, int timestamp); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_focus(long /*int*/ window, int timestamp) { + public static final void gdk_window_focus(long window, int timestamp) { lock.lock(); try { _gdk_window_focus(window, timestamp); @@ -2313,9 +2313,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_focus(long /*int*/ surface, int timestamp); + public static final native void _gdk_surface_focus(long surface, int timestamp); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_focus(long /*int*/ surface, int timestamp) { + public static final void gdk_surface_focus(long surface, int timestamp) { lock.lock(); try { _gdk_surface_focus(surface, timestamp); @@ -2327,9 +2327,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param rect cast=(GdkRectangle *),flags=no_in */ - public static final native void _gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect); + public static final native void _gdk_window_get_frame_extents(long window, GdkRectangle rect); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect) { + public static final void gdk_window_get_frame_extents(long window, GdkRectangle rect) { lock.lock(); try { _gdk_window_get_frame_extents(window, rect); @@ -2341,9 +2341,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param rect cast=(GdkRectangle *),flags=no_in */ - public static final native void _gdk_surface_get_frame_extents(long /*int*/ surface, GdkRectangle rect); + public static final native void _gdk_surface_get_frame_extents(long surface, GdkRectangle rect); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_get_frame_extents(long /*int*/ surface, GdkRectangle rect) { + public static final void gdk_surface_get_frame_extents(long surface, GdkRectangle rect) { lock.lock(); try { _gdk_surface_get_frame_extents(surface, rect); @@ -2356,9 +2356,9 @@ public class GDK extends OS { * @param x cast=(gint *) * @param y cast=(gint *) */ - public static final native int _gdk_window_get_origin(long /*int*/ window, int[] x, int[] y); + public static final native int _gdk_window_get_origin(long window, int[] x, int[] y); /** [GTK3 only, if-def'd in os.h] */ - public static final int gdk_window_get_origin(long /*int*/ window, int[] x, int[] y) { + public static final int gdk_window_get_origin(long window, int[] x, int[] y) { lock.lock(); try { return _gdk_window_get_origin(window, x, y); @@ -2371,9 +2371,9 @@ public class GDK extends OS { * @param x cast=(gint *) * @param y cast=(gint *) */ - public static final native int _gdk_surface_get_origin(long /*int*/ surface, int[] x, int[] y); + public static final native int _gdk_surface_get_origin(long surface, int[] x, int[] y); /** [GTK4 only, if-def'd in os.h] */ - public static final int gdk_surface_get_origin(long /*int*/ surface, int[] x, int[] y) { + public static final int gdk_surface_get_origin(long surface, int[] x, int[] y) { lock.lock(); try { return _gdk_surface_get_origin(surface, x, y); @@ -2388,9 +2388,9 @@ public class GDK extends OS { * @param y cast=(gint *) * @param mask cast=(GdkModifierType *) */ - public static final native long /*int*/ _gdk_window_get_device_position(long /*int*/ window, long /*int*/ device, int[] x, int[] y, int[] mask); + public static final native long _gdk_window_get_device_position(long window, long device, int[] x, int[] y, int[] mask); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_window_get_device_position(long /*int*/ window, long /*int*/ device, int[] x, int[] y, int[] mask) { + public static final long gdk_window_get_device_position(long window, long device, int[] x, int[] y, int[] mask) { lock.lock(); try { return _gdk_window_get_device_position(window, device, x, y, mask); @@ -2405,9 +2405,9 @@ public class GDK extends OS { * @param y cast=(gint *) * @param mask cast=(GdkModifierType *) */ - public static final native long /*int*/ _gdk_surface_get_device_position(long /*int*/ surface, long /*int*/ device, int[] x, int[] y, int[] mask); + public static final native long _gdk_surface_get_device_position(long surface, long device, int[] x, int[] y, int[] mask); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_surface_get_device_position(long /*int*/ surface, long /*int*/ device, int[] x, int[] y, int[] mask) { + public static final long gdk_surface_get_device_position(long surface, long device, int[] x, int[] y, int[] mask) { lock.lock(); try { return _gdk_surface_get_device_position(surface, device, x, y, mask); @@ -2416,9 +2416,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native long /*int*/ _gdk_window_get_parent(long /*int*/ window); + public static final native long _gdk_window_get_parent(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_window_get_parent(long /*int*/ window) { + public static final long gdk_window_get_parent(long window) { lock.lock(); try { return _gdk_window_get_parent(window); @@ -2431,9 +2431,9 @@ public class GDK extends OS { * @param x cast=(gint *) * @param y cast=(gint *) */ - public static final native void _gdk_window_get_root_origin(long /*int*/ window, int[] x, int[] y); + public static final native void _gdk_window_get_root_origin(long window, int[] x, int[] y); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_get_root_origin(long /*int*/ window, int[] x, int[] y) { + public static final void gdk_window_get_root_origin(long window, int[] x, int[] y) { lock.lock(); try { _gdk_window_get_root_origin(window, x, y); @@ -2446,9 +2446,9 @@ public class GDK extends OS { * @param x cast=(gint *) * @param y cast=(gint *) */ - public static final native void _gdk_surface_get_root_origin(long /*int*/ surface, int[] x, int[] y); + public static final native void _gdk_surface_get_root_origin(long surface, int[] x, int[] y); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_get_root_origin(long /*int*/ surface, int[] x, int[] y) { + public static final void gdk_surface_get_root_origin(long surface, int[] x, int[] y) { lock.lock(); try { _gdk_surface_get_root_origin(surface, x, y); @@ -2460,9 +2460,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param data cast=(gpointer *) */ - public static final native void _gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data); + public static final native void _gdk_window_get_user_data(long window, long /*int*/[] data); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data) { + public static final void gdk_window_get_user_data(long window, long /*int*/[] data) { lock.lock(); try { _gdk_window_get_user_data(window, data); @@ -2474,9 +2474,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param data cast=(gpointer *) */ - public static final native void _gdk_surface_get_user_data(long /*int*/ surface, long /*int*/[] data); + public static final native void _gdk_surface_get_user_data(long surface, long /*int*/[] data); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_get_user_data(long /*int*/ surface, long /*int*/[] data) { + public static final void gdk_surface_get_user_data(long surface, long /*int*/[] data) { lock.lock(); try { _gdk_surface_get_user_data(surface, data); @@ -2485,9 +2485,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_hide(long /*int*/ window); + public static final native void _gdk_window_hide(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_hide(long /*int*/ window) { + public static final void gdk_window_hide(long window) { lock.lock(); try { _gdk_window_hide(window); @@ -2496,9 +2496,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_hide(long /*int*/ surface); + public static final native void _gdk_surface_hide(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_hide(long /*int*/ surface) { + public static final void gdk_surface_hide(long surface) { lock.lock(); try { _gdk_surface_hide(surface); @@ -2511,9 +2511,9 @@ public class GDK extends OS { * @param rectangle cast=(GdkRectangle *),flags=no_out * @param invalidate_children cast=(gboolean) */ - public static final native void _gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children); + public static final native void _gdk_window_invalidate_rect(long window, GdkRectangle rectangle, boolean invalidate_children); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children) { + public static final void gdk_window_invalidate_rect(long window, GdkRectangle rectangle, boolean invalidate_children) { lock.lock(); try { _gdk_window_invalidate_rect(window, rectangle, invalidate_children); @@ -2525,9 +2525,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param rectangle cast=(GdkRectangle *),flags=no_out */ - public static final native void _gdk_surface_invalidate_rect(long /*int*/ surface, GdkRectangle rectangle); + public static final native void _gdk_surface_invalidate_rect(long surface, GdkRectangle rectangle); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_invalidate_rect(long /*int*/ surface, GdkRectangle rectangle) { + public static final void gdk_surface_invalidate_rect(long surface, GdkRectangle rectangle) { lock.lock(); try { _gdk_surface_invalidate_rect(surface, rectangle); @@ -2540,9 +2540,9 @@ public class GDK extends OS { * @param region cast=(const cairo_region_t *) * @param invalidate_children cast=(gboolean) */ - public static final native void _gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children); + public static final native void _gdk_window_invalidate_region(long window, long region, boolean invalidate_children); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children) { + public static final void gdk_window_invalidate_region(long window, long region, boolean invalidate_children) { lock.lock(); try { _gdk_window_invalidate_region(window, region, invalidate_children); @@ -2554,9 +2554,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param region cast=(const cairo_region_t *) */ - public static final native void _gdk_surface_invalidate_region(long /*int*/ surface, long /*int*/ region); + public static final native void _gdk_surface_invalidate_region(long surface, long region); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_invalidate_region(long /*int*/ surface, long /*int*/ region) { + public static final void gdk_surface_invalidate_region(long surface, long region) { lock.lock(); try { _gdk_surface_invalidate_region(surface, region); @@ -2565,9 +2565,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_move(long /*int*/ window, int x, int y); + public static final native void _gdk_window_move(long window, int x, int y); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_move(long /*int*/ window, int x, int y) { + public static final void gdk_window_move(long window, int x, int y) { lock.lock(); try { _gdk_window_move(window, x, y); @@ -2576,9 +2576,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_move(long /*int*/ surface, int x, int y); + public static final native void _gdk_surface_move(long surface, int x, int y); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_move(long /*int*/ surface, int x, int y) { + public static final void gdk_surface_move(long surface, int x, int y) { lock.lock(); try { _gdk_surface_move(surface, x, y); @@ -2587,9 +2587,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_move_resize(long /*int*/ window, int x, int y, int width, int height); + public static final native void _gdk_window_move_resize(long window, int x, int y, int width, int height); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_move_resize(long /*int*/ window, int x, int y, int width, int height) { + public static final void gdk_window_move_resize(long window, int x, int y, int width, int height) { lock.lock(); try { _gdk_window_move_resize(window, x, y, width, height); @@ -2612,9 +2612,9 @@ public class GDK extends OS { * @param parent cast=(GdkWindow *) * @param attributes flags=no_out */ - public static final native long /*int*/ _gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask); + public static final native long _gdk_window_new(long parent, GdkWindowAttr attributes, int attributes_mask); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask) { + public static final long gdk_window_new(long parent, GdkWindowAttr attributes, int attributes_mask) { lock.lock(); try { return _gdk_window_new(parent, attributes, attributes_mask); @@ -2626,9 +2626,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param rect flags=no_out */ - public static final native long /*int*/ _gdk_surface_new_child(long /*int*/ surface, GdkRectangle rect); + public static final native long _gdk_surface_new_child(long surface, GdkRectangle rect); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gdk_surface_new_child(long /*int*/ surface, GdkRectangle rect) { + public static final long gdk_surface_new_child(long surface, GdkRectangle rect) { lock.lock(); try { return _gdk_surface_new_child(surface, rect); @@ -2637,9 +2637,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_lower(long /*int*/ window); + public static final native void _gdk_window_lower(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_lower(long /*int*/ window) { + public static final void gdk_window_lower(long window) { lock.lock(); try { _gdk_window_lower(window); @@ -2648,9 +2648,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_lower(long /*int*/ surface); + public static final native void _gdk_surface_lower(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_lower(long /*int*/ surface) { + public static final void gdk_surface_lower(long surface) { lock.lock(); try { _gdk_surface_lower(surface); @@ -2676,9 +2676,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param update_children cast=(gboolean) */ - public static final native void _gdk_window_process_updates(long /*int*/ window, boolean update_children); + public static final native void _gdk_window_process_updates(long window, boolean update_children); /** [GTK3 only, if-def'd in os.h; 3.16 deprecated, replaced] */ - public static final void gdk_window_process_updates(long /*int*/ window, boolean update_children) { + public static final void gdk_window_process_updates(long window, boolean update_children) { lock.lock(); try { _gdk_window_process_updates(window, update_children); @@ -2687,9 +2687,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_raise(long /*int*/ window); + public static final native void _gdk_window_raise(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_raise(long /*int*/ window) { + public static final void gdk_window_raise(long window) { lock.lock(); try { _gdk_window_raise(window); @@ -2698,9 +2698,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_raise(long /*int*/ surface); + public static final native void _gdk_surface_raise(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_raise(long /*int*/ surface) { + public static final void gdk_surface_raise(long surface) { lock.lock(); try { _gdk_surface_raise(surface); @@ -2709,9 +2709,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_resize(long /*int*/ window, int width, int height); + public static final native void _gdk_window_resize(long window, int width, int height); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_resize(long /*int*/ window, int width, int height) { + public static final void gdk_window_resize(long window, int width, int height) { lock.lock(); try { _gdk_window_resize(window, width, height); @@ -2720,9 +2720,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_resize(long /*int*/ surface, int width, int height); + public static final native void _gdk_surface_resize(long surface, int width, int height); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_resize(long /*int*/ surface, int width, int height) { + public static final void gdk_surface_resize(long surface, int width, int height) { lock.lock(); try { _gdk_surface_resize(surface, width, height); @@ -2735,9 +2735,9 @@ public class GDK extends OS { * @param sibling cast=(GdkWindow *) * @param above cast=(gboolean) */ - public static final native void _gdk_window_restack(long /*int*/ window, long /*int*/ sibling, boolean above); + public static final native void _gdk_window_restack(long window, long sibling, boolean above); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_restack(long /*int*/ window, long /*int*/ sibling, boolean above) { + public static final void gdk_window_restack(long window, long sibling, boolean above) { lock.lock(); try { _gdk_window_restack(window, sibling, above); @@ -2750,9 +2750,9 @@ public class GDK extends OS { * @param sibling cast=(GdkSurface *) * @param above cast=(gboolean) */ - public static final native void _gdk_surface_restack(long /*int*/ surface, long /*int*/ sibling, boolean above); + public static final native void _gdk_surface_restack(long surface, long sibling, boolean above); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_restack(long /*int*/ surface, long /*int*/ sibling, boolean above) { + public static final void gdk_surface_restack(long surface, long sibling, boolean above) { lock.lock(); try { _gdk_surface_restack(surface, sibling, above); @@ -2764,9 +2764,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param pattern cast=(cairo_pattern_t *) */ - public static final native void _gdk_window_set_background_pattern(long /*int*/ window, long /*int*/ pattern); + public static final native void _gdk_window_set_background_pattern(long window, long pattern); /** [GTK3 only; 3.22 deprecated] */ - public static final void gdk_window_set_background_pattern(long /*int*/ window, long /*int*/ pattern) { + public static final void gdk_window_set_background_pattern(long window, long pattern) { lock.lock(); try { _gdk_window_set_background_pattern(window, pattern); @@ -2778,9 +2778,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param cursor cast=(GdkCursor *) */ - public static final native void _gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor); + public static final native void _gdk_window_set_cursor(long window, long cursor); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor) { + public static final void gdk_window_set_cursor(long window, long cursor) { lock.lock(); try { _gdk_window_set_cursor(window, cursor); @@ -2792,9 +2792,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param cursor cast=(GdkCursor *) */ - public static final native void _gdk_surface_set_cursor(long /*int*/ surface, long /*int*/ cursor); + public static final native void _gdk_surface_set_cursor(long surface, long cursor); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_set_cursor(long /*int*/ surface, long /*int*/ cursor) { + public static final void gdk_surface_set_cursor(long surface, long cursor) { lock.lock(); try { _gdk_surface_set_cursor(surface, cursor); @@ -2806,9 +2806,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param decorations cast=(GdkWMDecoration) */ - public static final native void _gdk_window_set_decorations(long /*int*/ window, int decorations); + public static final native void _gdk_window_set_decorations(long window, int decorations); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_set_decorations(long /*int*/ window, int decorations) { + public static final void gdk_window_set_decorations(long window, int decorations) { lock.lock(); try { _gdk_window_set_decorations(window, decorations); @@ -2820,9 +2820,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param decorations cast=(GdkWMDecoration) */ - public static final native void _gdk_surface_set_decorations(long /*int*/ surface, int decorations); + public static final native void _gdk_surface_set_decorations(long surface, int decorations); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_set_decorations(long /*int*/ surface, int decorations) { + public static final void gdk_surface_set_decorations(long surface, int decorations) { lock.lock(); try { _gdk_surface_set_decorations(surface, decorations); @@ -2834,9 +2834,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param functions cast=(GdkWMFunction) */ - public static final native void _gdk_window_set_functions(long /*int*/ window, int functions); + public static final native void _gdk_window_set_functions(long window, int functions); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_set_functions(long /*int*/ window, int functions) { + public static final void gdk_window_set_functions(long window, int functions) { lock.lock(); try { _gdk_window_set_functions(window, functions); @@ -2848,9 +2848,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param functions cast=(GdkWMFunction) */ - public static final native void _gdk_surface_set_functions(long /*int*/ surface, int functions); + public static final native void _gdk_surface_set_functions(long surface, int functions); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_set_functions(long /*int*/ surface, int functions) { + public static final void gdk_surface_set_functions(long surface, int functions) { lock.lock(); try { _gdk_surface_set_functions(surface, functions); @@ -2859,9 +2859,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_set_events(long /*int*/ window, int event_mask); + public static final native void _gdk_window_set_events(long window, int event_mask); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_set_events(long /*int*/ window, int event_mask) { + public static final void gdk_window_set_events(long window, int event_mask) { lock.lock(); try { _gdk_window_set_events(window, event_mask); @@ -2873,9 +2873,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param override_redirect cast=(gboolean) */ - public static final native void _gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect); + public static final native void _gdk_window_set_override_redirect(long window, boolean override_redirect); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect) { + public static final void gdk_window_set_override_redirect(long window, boolean override_redirect) { lock.lock(); try { _gdk_window_set_override_redirect(window, override_redirect); @@ -2887,9 +2887,9 @@ public class GDK extends OS { * @param window cast=(GdkWindow *) * @param user_data cast=(gpointer) */ - public static final native void _gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data); + public static final native void _gdk_window_set_user_data(long window, long user_data); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data) { + public static final void gdk_window_set_user_data(long window, long user_data) { lock.lock(); try { _gdk_window_set_user_data(window, user_data); @@ -2901,9 +2901,9 @@ public class GDK extends OS { * @param surface cast=(GdkSurface *) * @param user_data cast=(gpointer) */ - public static final native void _gdk_surface_set_user_data(long /*int*/ surface, long /*int*/ user_data); + public static final native void _gdk_surface_set_user_data(long surface, long user_data); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_set_user_data(long /*int*/ surface, long /*int*/ user_data) { + public static final void gdk_surface_set_user_data(long surface, long user_data) { lock.lock(); try { _gdk_surface_set_user_data(surface, user_data); @@ -2912,9 +2912,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_show(long /*int*/ window); + public static final native void _gdk_window_show(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_show(long /*int*/ window) { + public static final void gdk_window_show(long window) { lock.lock(); try { _gdk_window_show(window); @@ -2923,9 +2923,9 @@ public class GDK extends OS { } } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_show(long /*int*/ surface); + public static final native void _gdk_surface_show(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_show(long /*int*/ surface) { + public static final void gdk_surface_show(long surface) { lock.lock(); try { _gdk_surface_show(surface); @@ -2934,9 +2934,9 @@ public class GDK extends OS { } } /** @param window cast=(GdkWindow *) */ - public static final native void _gdk_window_show_unraised(long /*int*/ window); + public static final native void _gdk_window_show_unraised(long window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gdk_window_show_unraised(long /*int*/ window) { + public static final void gdk_window_show_unraised(long window) { lock.lock(); try { _gdk_window_show_unraised(window); @@ -2946,9 +2946,9 @@ public class GDK extends OS { } /** @param surface cast=(GdkSurface *) */ - public static final native void _gdk_surface_show_unraised(long /*int*/ surface); + public static final native void _gdk_surface_show_unraised(long surface); /** [GTK4 only, if-def'd in os.h] */ - public static final void gdk_surface_show_unraised(long /*int*/ surface) { + public static final void gdk_surface_show_unraised(long surface) { lock.lock(); try { _gdk_surface_show_unraised(surface); @@ -2957,12 +2957,12 @@ public class GDK extends OS { } } - public static long /*int*/ gdk_get_pointer (long /*int*/ display) { + public static long gdk_get_pointer (long display) { if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { - long /*int*/ default_seat = GDK.gdk_display_get_default_seat(display); + long default_seat = GDK.gdk_display_get_default_seat(display); return GDK.gdk_seat_get_pointer(default_seat); } else { - long /*int*/ device_manager = GDK.gdk_display_get_device_manager(display); + long device_manager = GDK.gdk_display_get_device_manager(display); return GDK.gdk_device_manager_get_client_pointer(device_manager); } } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java index 5a9152a16c..da2aba88b7 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java @@ -17,10 +17,10 @@ package org.eclipse.swt.internal.gtk; public class GInterfaceInfo { /** @field cast=(GInterfaceInitFunc) */ - public long /*int*/ interface_init; + public long interface_init; /** @field cast=(GInterfaceFinalizeFunc) */ - public long /*int*/ interface_finalize; + public long interface_finalize; /** @field cast=(gpointer) */ - public long /*int*/ interface_data; + public long interface_data; public static final int sizeof = OS.GInterfaceInfo_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java index bb344018af..8200deec87 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java @@ -17,17 +17,17 @@ package org.eclipse.swt.internal.gtk; public class GObjectClass { /** @field cast=(GObject *(*)()) */ - public long /*int*/ constructor; + public long constructor; /** @field cast=(void (*)()) */ - public long /*int*/ set_property; + public long set_property; /** @field cast=(void (*)()) */ - public long /*int*/ get_property; + public long get_property; /** @field cast=(void (*)()) */ - public long /*int*/ dispose; + public long dispose; /** @field cast=(void (*)()) */ - public long /*int*/ finalize; + public long finalize; /** @field cast=(void (*)()) */ - public long /*int*/ dispatch_properties_changed; + public long dispatch_properties_changed; /** @field cast=(void (*)()) */ - public long /*int*/ notify; + public long notify; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java index a6339aacba..c6e05cfdba 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java @@ -256,12 +256,12 @@ public class GTK extends OS { */ /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ GTK_WIDGET_GET_CLASS(long /*int*/ widget); + public static final native long GTK_WIDGET_GET_CLASS(long widget); /** @method flags=const */ - public static final native long /*int*/ GTK_TYPE_TEXT_VIEW_ACCESSIBLE (); - public static final native long /*int*/ _GTK_ACCESSIBLE (long /*int*/ handle); - public static final native boolean _GTK_IS_ACCEL_LABEL(long /*int*/ obj); - public static final boolean GTK_IS_ACCEL_LABEL(long /*int*/ obj) { + public static final native long GTK_TYPE_TEXT_VIEW_ACCESSIBLE (); + public static final native long _GTK_ACCESSIBLE (long handle); + public static final native boolean _GTK_IS_ACCEL_LABEL(long obj); + public static final boolean GTK_IS_ACCEL_LABEL(long obj) { lock.lock(); try { return _GTK_IS_ACCEL_LABEL(obj); @@ -269,8 +269,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_BUTTON(long /*int*/ obj); - public static final boolean GTK_IS_BUTTON(long /*int*/ obj) { + public static final native boolean _GTK_IS_BUTTON(long obj); + public static final boolean GTK_IS_BUTTON(long obj) { lock.lock(); try { return _GTK_IS_BUTTON(obj); @@ -278,8 +278,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_LABEL(long /*int*/ obj); - public static final boolean GTK_IS_LABEL(long /*int*/ obj) { + public static final native boolean _GTK_IS_LABEL(long obj); + public static final boolean GTK_IS_LABEL(long obj) { lock.lock(); try { return _GTK_IS_LABEL(obj); @@ -287,8 +287,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_SCROLLED_WINDOW(long /*int*/ obj); - public static final boolean GTK_IS_SCROLLED_WINDOW(long /*int*/ obj) { + public static final native boolean _GTK_IS_SCROLLED_WINDOW(long obj); + public static final boolean GTK_IS_SCROLLED_WINDOW(long obj) { lock.lock(); try { return _GTK_IS_SCROLLED_WINDOW(obj); @@ -296,8 +296,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_WINDOW(long /*int*/ obj); - public static final boolean GTK_IS_WINDOW(long /*int*/ obj) { + public static final native boolean _GTK_IS_WINDOW(long obj); + public static final boolean GTK_IS_WINDOW(long obj) { lock.lock(); try { return _GTK_IS_WINDOW(obj); @@ -305,8 +305,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj); - public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj) { + public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(long obj); + public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(long obj) { lock.lock(); try { return _GTK_IS_CELL_RENDERER_PIXBUF(obj); @@ -314,8 +314,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj); - public static final boolean GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj) { + public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(long obj); + public static final boolean GTK_IS_CELL_RENDERER_TEXT(long obj) { lock.lock(); try { return _GTK_IS_CELL_RENDERER_TEXT(obj); @@ -323,8 +323,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj); - public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj) { + public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(long obj); + public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(long obj) { lock.lock(); try { return _GTK_IS_CELL_RENDERER_TOGGLE(obj); @@ -332,8 +332,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_CONTAINER(long /*int*/ obj); - public static final boolean GTK_IS_CONTAINER(long /*int*/ obj) { + public static final native boolean _GTK_IS_CONTAINER(long obj); + public static final boolean GTK_IS_CONTAINER(long obj) { lock.lock(); try { return _GTK_IS_CONTAINER(obj); @@ -341,8 +341,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_MENU_ITEM(long /*int*/ obj); - public static final boolean GTK_IS_MENU_ITEM(long /*int*/ obj) { + public static final native boolean _GTK_IS_MENU_ITEM(long obj); + public static final boolean GTK_IS_MENU_ITEM(long obj) { lock.lock(); try { return _GTK_IS_MENU_ITEM(obj); @@ -350,8 +350,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native boolean _GTK_IS_PLUG(long /*int*/ obj); - public static final boolean GTK_IS_PLUG(long /*int*/ obj) { + public static final native boolean _GTK_IS_PLUG(long obj); + public static final boolean GTK_IS_PLUG(long obj) { lock.lock(); try { return _GTK_IS_PLUG(obj); @@ -360,8 +360,8 @@ public class GTK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TEXT(); - public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TEXT() { + public static final native long _GTK_TYPE_CELL_RENDERER_TEXT(); + public static final long GTK_TYPE_CELL_RENDERER_TEXT() { lock.lock(); try { return _GTK_TYPE_CELL_RENDERER_TEXT(); @@ -370,8 +370,8 @@ public class GTK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_PIXBUF(); - public static final long /*int*/ GTK_TYPE_CELL_RENDERER_PIXBUF() { + public static final native long _GTK_TYPE_CELL_RENDERER_PIXBUF(); + public static final long GTK_TYPE_CELL_RENDERER_PIXBUF() { lock.lock(); try { return _GTK_TYPE_CELL_RENDERER_PIXBUF(); @@ -380,8 +380,8 @@ public class GTK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TOGGLE(); - public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TOGGLE() { + public static final native long _GTK_TYPE_CELL_RENDERER_TOGGLE(); + public static final long GTK_TYPE_CELL_RENDERER_TOGGLE() { lock.lock(); try { return _GTK_TYPE_CELL_RENDERER_TOGGLE(); @@ -390,8 +390,8 @@ public class GTK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GTK_TYPE_IM_MULTICONTEXT(); - public static final long /*int*/ GTK_TYPE_IM_MULTICONTEXT() { + public static final native long _GTK_TYPE_IM_MULTICONTEXT(); + public static final long GTK_TYPE_IM_MULTICONTEXT() { lock.lock(); try { return _GTK_TYPE_IM_MULTICONTEXT(); @@ -400,8 +400,8 @@ public class GTK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GTK_TYPE_MENU(); - public static final long /*int*/ GTK_TYPE_MENU() { + public static final native long _GTK_TYPE_MENU(); + public static final long GTK_TYPE_MENU() { lock.lock(); try { return _GTK_TYPE_MENU(); @@ -410,8 +410,8 @@ public class GTK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GTK_TYPE_WIDGET(); - public static final long /*int*/ GTK_TYPE_WIDGET() { + public static final native long _GTK_TYPE_WIDGET(); + public static final long GTK_TYPE_WIDGET() { lock.lock(); try { return _GTK_TYPE_WIDGET(); @@ -420,8 +420,8 @@ public class GTK extends OS { } } /** @method flags=const */ - public static final native long /*int*/ _GTK_TYPE_WINDOW(); - public static final long /*int*/ GTK_TYPE_WINDOW() { + public static final native long _GTK_TYPE_WINDOW(); + public static final long GTK_TYPE_WINDOW() { lock.lock(); try { return _GTK_TYPE_WINDOW(); @@ -432,8 +432,8 @@ public class GTK extends OS { // See os_custom.h // Dynamically get's the function pointer to gtk_false(). Gtk2/Gtk3. - public static final native long /*int*/ _GET_FUNCTION_POINTER_gtk_false(); - public static final long /*int*/ GET_FUNCTION_POINTER_gtk_false() { + public static final native long _GET_FUNCTION_POINTER_gtk_false(); + public static final long GET_FUNCTION_POINTER_gtk_false() { lock.lock(); try { return _GET_FUNCTION_POINTER_gtk_false(); @@ -443,8 +443,8 @@ public class GTK extends OS { } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_has_default(long /*int*/ widget); - public static final boolean gtk_widget_has_default(long /*int*/ widget) { + public static final native boolean _gtk_widget_has_default(long widget); + public static final boolean gtk_widget_has_default(long widget) { lock.lock(); try { return _gtk_widget_has_default(widget); @@ -454,8 +454,8 @@ public class GTK extends OS { } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_sensitive(long /*int*/ widget); - public static final boolean gtk_widget_get_sensitive(long /*int*/ widget) { + public static final native boolean _gtk_widget_get_sensitive(long widget); + public static final boolean gtk_widget_get_sensitive(long widget) { lock.lock(); try { return _gtk_widget_get_sensitive(widget); @@ -465,9 +465,9 @@ public class GTK extends OS { } /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_first_child(long /*int*/ widget); + public static final native long _gtk_widget_get_first_child(long widget); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_widget_get_first_child(long /*int*/ widget) { + public static final long gtk_widget_get_first_child(long widget) { lock.lock(); try { return _gtk_widget_get_first_child(widget); @@ -491,9 +491,9 @@ public class GTK extends OS { /** * @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_screen(long /*int*/ widget); + public static final native long _gtk_widget_get_screen(long widget); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_widget_get_screen(long /*int*/ widget) { + public static final long gtk_widget_get_screen(long widget) { lock.lock(); try { return _gtk_widget_get_screen(widget); @@ -503,8 +503,8 @@ public class GTK extends OS { } /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_name(long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_name(long /*int*/ widget) { + public static final native long _gtk_widget_get_name(long widget); + public static final long gtk_widget_get_name(long widget) { lock.lock(); try { return _gtk_widget_get_name(widget); @@ -516,8 +516,8 @@ public class GTK extends OS { /** @method flags=dynamic * @param widget_class cast=(GtkWidgetClass *) */ - public static final native long /*int*/ _gtk_widget_class_get_css_name(long /*int*/ widget_class); - public static final long /*int*/ gtk_widget_class_get_css_name(long /*int*/ widget_class) { + public static final native long _gtk_widget_class_get_css_name(long widget_class); + public static final long gtk_widget_class_get_css_name(long widget_class) { lock.lock(); try { return _gtk_widget_class_get_css_name(widget_class); @@ -527,8 +527,8 @@ public class GTK extends OS { } /** @param button cast=(GtkButton *) */ - public static final native void _gtk_button_clicked(long /*int*/ button); - public static final void gtk_button_clicked(long /*int*/ button) { + public static final native void _gtk_button_clicked(long button); + public static final void gtk_button_clicked(long button) { lock.lock(); try { _gtk_button_clicked(button); @@ -537,8 +537,8 @@ public class GTK extends OS { } } - public static final native long /*int*/ _gtk_button_new(); - public static final long /*int*/ gtk_button_new() { + public static final native long _gtk_button_new(); + public static final long gtk_button_new() { lock.lock(); try { return _gtk_button_new(); @@ -552,9 +552,9 @@ public class GTK extends OS { * @param button cast=(GtkButton *) * @param image cast=(GtkWidget *) */ - public static final native void /*int*/ _gtk_button_set_image(long /*int*/ button, long /*int*/ image); + public static final native void _gtk_button_set_image(long button, long image); /** [GTK3 only] */ - public static final void /*int*/ gtk_button_set_image(long /*int*/ button, long /*int*/ image) { + public static final void gtk_button_set_image(long button, long image) { lock.lock(); try { _gtk_button_set_image(button, image); @@ -569,8 +569,8 @@ public class GTK extends OS { * @param accel_key cast=(guint) * @param accel_mods cast=(GdkModifierType) */ - public static final native void _gtk_accel_label_set_accel(long /*int*/ accel_label, int accel_key, int accel_mods); - public static final void gtk_accel_label_set_accel(long /*int*/ accel_label, int accel_key, int accel_mods) { + public static final native void _gtk_accel_label_set_accel(long accel_label, int accel_key, int accel_mods); + public static final void gtk_accel_label_set_accel(long accel_label, int accel_key, int accel_mods) { lock.lock(); try { _gtk_accel_label_set_accel(accel_label, accel_key, accel_mods); @@ -592,8 +592,8 @@ public class GTK extends OS { * @param accelerator_key cast=(guint *) * @param accelerator_mods cast=(GdkModifierType *) */ - public static final native void _gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods); - public static final void gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods) { + public static final native void _gtk_accelerator_parse(long accelerator, int [] accelerator_key, int [] accelerator_mods); + public static final void gtk_accelerator_parse(long accelerator, int [] accelerator_key, int [] accelerator_mods) { lock.lock(); try { _gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods); @@ -601,8 +601,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_accel_group_new(); - public static final long /*int*/ gtk_accel_group_new() { + public static final native long _gtk_accel_group_new(); + public static final long gtk_accel_group_new() { lock.lock(); try { return _gtk_accel_group_new(); @@ -614,8 +614,8 @@ public class GTK extends OS { * @param accel_label cast=(GtkAccelLabel *) * @param accel_widget cast=(GtkWidget *) */ - public static final native void _gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget); - public static final void gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget) { + public static final native void _gtk_accel_label_set_accel_widget(long accel_label, long accel_widget); + public static final void gtk_accel_label_set_accel_widget(long accel_label, long accel_widget) { lock.lock(); try { _gtk_accel_label_set_accel_widget(accel_label, accel_widget); @@ -624,8 +624,8 @@ public class GTK extends OS { } } /** @param label cast=(const gchar *) */ - public static final native long /*int*/ _gtk_accel_label_new(byte[] label); - public static final long /*int*/ gtk_accel_label_new(byte[] label) { + public static final native long _gtk_accel_label_new(byte[] label); + public static final long gtk_accel_label_new(byte[] label) { lock.lock(); try { return _gtk_accel_label_new(label); @@ -636,8 +636,8 @@ public class GTK extends OS { /** * @param accessible cast=(GtkAccessible *) */ - public static final native long /*int*/ _gtk_accessible_get_widget(long /*int*/ accessible); - public static final long /*int*/ gtk_accessible_get_widget(long /*int*/ accessible) { + public static final native long _gtk_accessible_get_widget(long accessible); + public static final long gtk_accessible_get_widget(long accessible) { lock.lock(); try { return _gtk_accessible_get_widget(accessible); @@ -648,8 +648,8 @@ public class GTK extends OS { /** * @param adjustment cast=(GtkAdjustment *) */ - public static final native void _gtk_adjustment_configure(long /*int*/ adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size); - public static final void gtk_adjustment_configure(long /*int*/ adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size) { + public static final native void _gtk_adjustment_configure(long adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size); + public static final void gtk_adjustment_configure(long adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size) { lock.lock(); try { _gtk_adjustment_configure(adjustment, value, lower, upper, step_increment, page_increment, page_size); @@ -664,8 +664,8 @@ public class GTK extends OS { * @param step_increment cast=(gdouble) * @param page_increment cast=(gdouble) */ - public static final native long /*int*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size); - public static final long /*int*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) { + public static final native long _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size); + public static final long gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) { lock.lock(); try { return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size); @@ -676,8 +676,8 @@ public class GTK extends OS { /** * @param adjustment cast=(GtkAdjustment *) */ - public static final native double _gtk_adjustment_get_lower(long /*int*/ adjustment); - public static final double gtk_adjustment_get_lower(long /*int*/ adjustment) { + public static final native double _gtk_adjustment_get_lower(long adjustment); + public static final double gtk_adjustment_get_lower(long adjustment) { lock.lock(); try { return _gtk_adjustment_get_lower(adjustment); @@ -688,8 +688,8 @@ public class GTK extends OS { /** * @param adjustment cast=(GtkAdjustment *) */ - public static final native double _gtk_adjustment_get_page_increment(long /*int*/ adjustment); - public static final double gtk_adjustment_get_page_increment(long /*int*/ adjustment) { + public static final native double _gtk_adjustment_get_page_increment(long adjustment); + public static final double gtk_adjustment_get_page_increment(long adjustment) { lock.lock(); try { return _gtk_adjustment_get_page_increment(adjustment); @@ -700,8 +700,8 @@ public class GTK extends OS { /** * @param adjustment cast=(GtkAdjustment *) */ - public static final native double _gtk_adjustment_get_page_size(long /*int*/ adjustment); - public static final double gtk_adjustment_get_page_size(long /*int*/ adjustment) { + public static final native double _gtk_adjustment_get_page_size(long adjustment); + public static final double gtk_adjustment_get_page_size(long adjustment) { lock.lock(); try { return _gtk_adjustment_get_page_size(adjustment); @@ -712,8 +712,8 @@ public class GTK extends OS { /** * @param adjustment cast=(GtkAdjustment *) */ - public static final native double _gtk_adjustment_get_step_increment(long /*int*/ adjustment); - public static final double gtk_adjustment_get_step_increment(long /*int*/ adjustment) { + public static final native double _gtk_adjustment_get_step_increment(long adjustment); + public static final double gtk_adjustment_get_step_increment(long adjustment) { lock.lock(); try { return _gtk_adjustment_get_step_increment(adjustment); @@ -724,8 +724,8 @@ public class GTK extends OS { /** * @param adjustment cast=(GtkAdjustment *) */ - public static final native double _gtk_adjustment_get_upper(long /*int*/ adjustment); - public static final double gtk_adjustment_get_upper(long /*int*/ adjustment) { + public static final native double _gtk_adjustment_get_upper(long adjustment); + public static final double gtk_adjustment_get_upper(long adjustment) { lock.lock(); try { return _gtk_adjustment_get_upper(adjustment); @@ -736,8 +736,8 @@ public class GTK extends OS { /** * @param adjustment cast=(GtkAdjustment *) */ - public static final native double _gtk_adjustment_get_value(long /*int*/ adjustment); - public static final double gtk_adjustment_get_value(long /*int*/ adjustment) { + public static final native double _gtk_adjustment_get_value(long adjustment); + public static final double gtk_adjustment_get_value(long adjustment) { lock.lock(); try { return _gtk_adjustment_get_value(adjustment); @@ -749,8 +749,8 @@ public class GTK extends OS { * @param adjustment cast=(GtkAdjustment *) * @param value cast=(gdouble) */ - public static final native void _gtk_adjustment_set_value(long /*int*/ adjustment, double value); - public static final void gtk_adjustment_set_value(long /*int*/ adjustment, double value) { + public static final native void _gtk_adjustment_set_value(long adjustment, double value); + public static final void gtk_adjustment_set_value(long adjustment, double value) { lock.lock(); try { _gtk_adjustment_set_value(adjustment, value); @@ -762,8 +762,8 @@ public class GTK extends OS { * @param adjustment cast=(GtkAdjustment *) * @param value cast=(gdouble) */ - public static final native void _gtk_adjustment_set_step_increment(long /*int*/ adjustment, double value); - public static final void gtk_adjustment_set_step_increment(long /*int*/ adjustment, double value) { + public static final native void _gtk_adjustment_set_step_increment(long adjustment, double value); + public static final void gtk_adjustment_set_step_increment(long adjustment, double value) { lock.lock(); try { _gtk_adjustment_set_step_increment(adjustment, value); @@ -775,8 +775,8 @@ public class GTK extends OS { * @param adjustment cast=(GtkAdjustment *) * @param value cast=(gdouble) */ - public static final native void _gtk_adjustment_set_page_increment(long /*int*/ adjustment, double value); - public static final void gtk_adjustment_set_page_increment(long /*int*/ adjustment, double value) { + public static final native void _gtk_adjustment_set_page_increment(long adjustment, double value); + public static final void gtk_adjustment_set_page_increment(long adjustment, double value) { lock.lock(); try { _gtk_adjustment_set_page_increment(adjustment, value); @@ -788,9 +788,9 @@ public class GTK extends OS { * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) * */ - public static final native void _gtk_adjustment_value_changed(long /*int*/ adjustment); + public static final native void _gtk_adjustment_value_changed(long adjustment); /** [GTK2/GTK3; 3.18 deprecated, replaced] */ - public static final void gtk_adjustment_value_changed(long /*int*/ adjustment) { + public static final void gtk_adjustment_value_changed(long adjustment) { lock.lock(); try { _gtk_adjustment_value_changed(adjustment); @@ -799,8 +799,8 @@ public class GTK extends OS { } } /** @param bin cast=(GtkBin *) */ - public static final native long /*int*/ _gtk_bin_get_child(long /*int*/ bin); - public static final long /*int*/ gtk_bin_get_child(long /*int*/ bin) { + public static final native long _gtk_bin_get_child(long bin); + public static final long gtk_bin_get_child(long bin) { lock.lock(); try { return _gtk_bin_get_child(bin); @@ -809,8 +809,8 @@ public class GTK extends OS { } } /** @param border cast=(GtkBorder *) */ - public static final native void _gtk_border_free(long /*int*/ border); - public static final void gtk_border_free(long /*int*/ border) { + public static final native void _gtk_border_free(long border); + public static final void gtk_border_free(long border) { lock.lock(); try { _gtk_border_free(border); @@ -819,8 +819,8 @@ public class GTK extends OS { } } /** @param box cast=(GtkBox *) */ - public static final native void _gtk_box_set_spacing(long /*int*/ box, int spacing); - public static final void gtk_box_set_spacing(long /*int*/ box, int spacing) { + public static final native void _gtk_box_set_spacing(long box, int spacing); + public static final void gtk_box_set_spacing(long box, int spacing) { lock.lock(); try { _gtk_box_set_spacing(box, spacing); @@ -833,9 +833,9 @@ public class GTK extends OS { * @param box cast=(GtkBox *) * @param child cast=(GtkWidget *) */ - public static final native void _gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type); + public static final native void _gtk_box_set_child_packing(long box, long child, boolean expand, boolean fill, int padding, int pack_type); /** [GTK3 only] */ - public static final void gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type) { + public static final void gtk_box_set_child_packing(long box, long child, boolean expand, boolean fill, int padding, int pack_type) { lock.lock(); try { _gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type); @@ -848,9 +848,9 @@ public class GTK extends OS { * @param box cast=(GtkBox *) * @param child cast=(GtkWidget *) */ - public static final native void _gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, int pack_type); + public static final native void _gtk_box_set_child_packing(long box, long child, int pack_type); /** [GTK4 only] */ - public static final void gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, int pack_type) { + public static final void gtk_box_set_child_packing(long box, long child, int pack_type) { lock.lock(); try { _gtk_box_set_child_packing(box, child, pack_type); @@ -858,8 +858,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_calendar_new(); - public static final long /*int*/ gtk_calendar_new() { + public static final native long _gtk_calendar_new(); + public static final long gtk_calendar_new() { lock.lock(); try { return _gtk_calendar_new(); @@ -872,8 +872,8 @@ public class GTK extends OS { * @param month cast=(guint) * @param year cast=(guint) */ - public static final native void /*long*/ _gtk_calendar_select_month(long /*int*/ calendar, int month, int year); - public static final void /*long*/ gtk_calendar_select_month(long /*int*/ calendar, int month, int year) { + public static final native void /*long*/ _gtk_calendar_select_month(long calendar, int month, int year); + public static final void /*long*/ gtk_calendar_select_month(long calendar, int month, int year) { lock.lock(); try { _gtk_calendar_select_month(calendar, month, year); @@ -885,8 +885,8 @@ public class GTK extends OS { * @param calendar cast=(GtkCalendar *) * @param day cast=(guint) */ - public static final native void _gtk_calendar_select_day(long /*int*/ calendar, int day); - public static final void gtk_calendar_select_day(long /*int*/ calendar, int day) { + public static final native void _gtk_calendar_select_day(long calendar, int day); + public static final void gtk_calendar_select_day(long calendar, int day) { lock.lock(); try { _gtk_calendar_select_day(calendar, day); @@ -898,8 +898,8 @@ public class GTK extends OS { * @param calendar cast=(GtkCalendar *) * @param day cast=(guint) */ - public static final native void _gtk_calendar_mark_day(long /*int*/ calendar, int day); - public static final void gtk_calendar_mark_day(long /*int*/ calendar, int day) { + public static final native void _gtk_calendar_mark_day(long calendar, int day); + public static final void gtk_calendar_mark_day(long calendar, int day) { lock.lock(); try { _gtk_calendar_mark_day(calendar, day); @@ -910,8 +910,8 @@ public class GTK extends OS { /** * @param calendar cast=(GtkCalendar *) */ - public static final native void _gtk_calendar_clear_marks(long /*int*/ calendar); - public static final void gtk_calendar_clear_marks(long /*int*/ calendar) { + public static final native void _gtk_calendar_clear_marks(long calendar); + public static final void gtk_calendar_clear_marks(long calendar) { lock.lock(); try { _gtk_calendar_clear_marks(calendar); @@ -923,8 +923,8 @@ public class GTK extends OS { * @param calendar cast=(GtkCalendar *) * @param flags cast=(GtkCalendarDisplayOptions) */ - public static final native void _gtk_calendar_set_display_options(long /*int*/ calendar, int flags); - public static final void gtk_calendar_set_display_options(long /*int*/ calendar, int flags) { + public static final native void _gtk_calendar_set_display_options(long calendar, int flags); + public static final void gtk_calendar_set_display_options(long calendar, int flags) { lock.lock(); try { _gtk_calendar_set_display_options(calendar, flags); @@ -938,8 +938,8 @@ public class GTK extends OS { * @param month cast=(guint *) * @param day cast=(guint *) */ - public static final native void _gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day); - public static final void gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day) { + public static final native void _gtk_calendar_get_date(long calendar, int[] year, int[] month, int[] day); + public static final void gtk_calendar_get_date(long calendar, int[] year, int[] month, int[] day) { lock.lock(); try { _gtk_calendar_get_date(calendar, year, month, day); @@ -948,8 +948,8 @@ public class GTK extends OS { } } /** @param cell_layout cast=(GtkCellLayout *) */ - public static final native void _gtk_cell_layout_clear(long /*int*/ cell_layout); - public static final void gtk_cell_layout_clear(long /*int*/ cell_layout) { + public static final native void _gtk_cell_layout_clear(long cell_layout); + public static final void gtk_cell_layout_clear(long cell_layout) { lock.lock(); try { _gtk_cell_layout_clear(cell_layout); @@ -958,8 +958,8 @@ public class GTK extends OS { } } /** @param cell_layout cast=(GtkCellLayout *) */ - public static final native long /*int*/ _gtk_cell_layout_get_cells(long /*int*/ cell_layout); - public static final long /*int*/ gtk_cell_layout_get_cells(long /*int*/ cell_layout) { + public static final native long _gtk_cell_layout_get_cells(long cell_layout); + public static final long gtk_cell_layout_get_cells(long cell_layout) { lock.lock(); try { return _gtk_cell_layout_get_cells(cell_layout); @@ -972,8 +972,8 @@ public class GTK extends OS { * @param cell cast=(GtkCellRenderer *) * @param sentinel cast=(const gchar *),flags=sentinel */ - public static final native void _gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel); - public static final void gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel) { + public static final native void _gtk_cell_layout_set_attributes(long cell_layout, long cell, byte[] attribute, int column, long sentinel); + public static final void gtk_cell_layout_set_attributes(long cell_layout, long cell, byte[] attribute, int column, long sentinel) { lock.lock(); try { _gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel); @@ -985,8 +985,8 @@ public class GTK extends OS { * @param cell_layout cast=(GtkCellLayout *) * @param cell cast=(GtkCellRenderer *) */ - public static final native void _gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand); - public static final void gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand) { + public static final native void _gtk_cell_layout_pack_start(long cell_layout, long cell, boolean expand); + public static final void gtk_cell_layout_pack_start(long cell_layout, long cell, boolean expand) { lock.lock(); try { _gtk_cell_layout_pack_start(cell_layout, cell, expand); @@ -1000,8 +1000,8 @@ public class GTK extends OS { * @param minimum_size cast=(GtkRequisition *) * @param natural_size cast=(GtkRequisition *) */ - public static final native void _gtk_cell_renderer_get_preferred_size(long /*int*/ cell, long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size); - public static final void gtk_cell_renderer_get_preferred_size(long /*int*/ cell, long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size) { + public static final native void _gtk_cell_renderer_get_preferred_size(long cell, long widget, GtkRequisition minimum_size, GtkRequisition natural_size); + public static final void gtk_cell_renderer_get_preferred_size(long cell, long widget, GtkRequisition minimum_size, GtkRequisition natural_size) { lock.lock(); try { _gtk_cell_renderer_get_preferred_size(cell, widget, minimum_size, natural_size); @@ -1014,8 +1014,8 @@ public class GTK extends OS { * @param xpad cast=(gint *) * @param ypad cast=(gint *) */ - public static final native void _gtk_cell_renderer_get_padding(long /*int*/ cell, int [] xpad, int [] ypad); - public static final void gtk_cell_renderer_get_padding(long /*int*/ cell, int [] xpad, int [] ypad) { + public static final native void _gtk_cell_renderer_get_padding(long cell, int [] xpad, int [] ypad); + public static final void gtk_cell_renderer_get_padding(long cell, int [] xpad, int [] ypad) { lock.lock(); try { _gtk_cell_renderer_get_padding(cell, xpad, ypad); @@ -1030,8 +1030,8 @@ public class GTK extends OS { * @param minimum_height cast=(gint *) * @param natural_height cast=(gint *) */ - public static final native void _gtk_cell_renderer_get_preferred_height_for_width(long /*int*/ cell, long /*int*/ widget, int width, int[] minimum_height, int[] natural_height); - public static final void gtk_cell_renderer_get_preferred_height_for_width(long /*int*/ cell, long /*int*/ widget, int width, int[] minimum_height, int[] natural_height) { + public static final native void _gtk_cell_renderer_get_preferred_height_for_width(long cell, long widget, int width, int[] minimum_height, int[] natural_height); + public static final void gtk_cell_renderer_get_preferred_height_for_width(long cell, long widget, int width, int[] minimum_height, int[] natural_height) { lock.lock(); try { _gtk_cell_renderer_get_preferred_height_for_width(cell, widget, width, minimum_height, natural_height); @@ -1044,8 +1044,8 @@ public class GTK extends OS { * @param width cast=(gint) * @param height cast=(gint) */ - public static final native void _gtk_cell_renderer_set_fixed_size(long /*int*/ cell, int width, int height); - public static final void gtk_cell_renderer_set_fixed_size (long /*int*/ cell, int width, int height) { + public static final native void _gtk_cell_renderer_set_fixed_size(long cell, int width, int height); + public static final void gtk_cell_renderer_set_fixed_size (long cell, int width, int height) { lock.lock(); try { _gtk_cell_renderer_set_fixed_size(cell, width, height); @@ -1058,8 +1058,8 @@ public class GTK extends OS { * @param width cast=(gint *) * @param height cast=(gint *) */ - public static final native void _gtk_cell_renderer_get_fixed_size(long /*int*/ cell, int[] width, int[] height); - public static final void gtk_cell_renderer_get_fixed_size (long /*int*/ cell, int[] width, int[] height) { + public static final native void _gtk_cell_renderer_get_fixed_size(long cell, int[] width, int[] height); + public static final void gtk_cell_renderer_get_fixed_size (long cell, int[] width, int[] height) { lock.lock(); try { _gtk_cell_renderer_get_fixed_size(cell, width, height); @@ -1072,8 +1072,8 @@ public class GTK extends OS { * @param minimum_size cast=(GtkRequisition *) * @param natural_size cast=(GtkRequisition *) */ - public static final native void _gtk_widget_get_preferred_size(long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size); - public static final void gtk_widget_get_preferred_size(long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size) { + public static final native void _gtk_widget_get_preferred_size(long widget, GtkRequisition minimum_size, GtkRequisition natural_size); + public static final void gtk_widget_get_preferred_size(long widget, GtkRequisition minimum_size, GtkRequisition natural_size) { lock.lock(); try { _gtk_widget_get_preferred_size(widget, minimum_size, natural_size); @@ -1088,9 +1088,9 @@ public class GTK extends OS { * @param minimum_size cast=(gint *) * @param natural_size cast=(gint *) */ - public static final native void _gtk_widget_get_preferred_height_for_width(long /*int*/ widget, int width, int[] minimum_size, int[] natural_size); + public static final native void _gtk_widget_get_preferred_height_for_width(long widget, int width, int[] minimum_size, int[] natural_size); /** [GTK3 only] */ - public static final void gtk_widget_get_preferred_height_for_width(long /*int*/ widget, int width, int[] minimum_size, int[] natural_size) { + public static final void gtk_widget_get_preferred_height_for_width(long widget, int width, int[] minimum_size, int[] natural_size) { lock.lock(); try { _gtk_widget_get_preferred_height_for_width(widget, width, minimum_size, natural_size); @@ -1104,9 +1104,9 @@ public class GTK extends OS { * @param minimum_size cast=(gint *) * @param natural_size cast=(gint *) */ - public static final native void _gtk_widget_get_preferred_height(long /*int*/ widget, int[] minimum_size, int[] natural_size); + public static final native void _gtk_widget_get_preferred_height(long widget, int[] minimum_size, int[] natural_size); /** [GTK3 only] */ - public static final void gtk_widget_get_preferred_height(long /*int*/ widget, int[] minimum_size, int[] natural_size) { + public static final void gtk_widget_get_preferred_height(long widget, int[] minimum_size, int[] natural_size) { lock.lock(); try { _gtk_widget_get_preferred_height(widget, minimum_size, natural_size); @@ -1121,9 +1121,9 @@ public class GTK extends OS { * @param minimum_size cast=(gint *) * @param natural_size cast=(gint *) */ - public static final native void _gtk_widget_get_preferred_width_for_height(long /*int*/ widget, int height, int[] minimum_size, int[] natural_size); + public static final native void _gtk_widget_get_preferred_width_for_height(long widget, int height, int[] minimum_size, int[] natural_size); /** [GTK3 only] */ - public static final void gtk_widget_get_preferred_width_for_height(long /*int*/ widget, int height, int[] minimum_size, int[] natural_size) { + public static final void gtk_widget_get_preferred_width_for_height(long widget, int height, int[] minimum_size, int[] natural_size) { lock.lock(); try { _gtk_widget_get_preferred_width_for_height(widget, height, minimum_size, natural_size); @@ -1131,8 +1131,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_cell_renderer_pixbuf_new(); - public static final long /*int*/ gtk_cell_renderer_pixbuf_new() { + public static final native long _gtk_cell_renderer_pixbuf_new(); + public static final long gtk_cell_renderer_pixbuf_new() { lock.lock(); try { return _gtk_cell_renderer_pixbuf_new(); @@ -1140,8 +1140,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_cell_renderer_text_new(); - public static final long /*int*/ gtk_cell_renderer_text_new() { + public static final native long _gtk_cell_renderer_text_new(); + public static final long gtk_cell_renderer_text_new() { lock.lock(); try { return _gtk_cell_renderer_text_new(); @@ -1149,8 +1149,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_cell_renderer_toggle_new(); - public static final long /*int*/ gtk_cell_renderer_toggle_new() { + public static final native long _gtk_cell_renderer_toggle_new(); + public static final long gtk_cell_renderer_toggle_new() { lock.lock(); try { return _gtk_cell_renderer_toggle_new(); @@ -1162,8 +1162,8 @@ public class GTK extends OS { * @param cell_view cast=(GtkCellView *) * @param fit_model cast=(gboolean) */ - public static final native void _gtk_cell_view_set_fit_model(long /*int*/ cell_view, boolean fit_model); - public static final void gtk_cell_view_set_fit_model(long /*int*/ cell_view, boolean fit_model) { + public static final native void _gtk_cell_view_set_fit_model(long cell_view, boolean fit_model); + public static final void gtk_cell_view_set_fit_model(long cell_view, boolean fit_model) { lock.lock(); try { _gtk_cell_view_set_fit_model(cell_view, fit_model); @@ -1171,8 +1171,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_check_button_new(); - public static final long /*int*/ gtk_check_button_new() { + public static final native long _gtk_check_button_new(); + public static final long gtk_check_button_new() { lock.lock(); try { return _gtk_check_button_new(); @@ -1181,8 +1181,8 @@ public class GTK extends OS { } } /** @param check_menu_item cast=(GtkCheckMenuItem *) */ - public static final native boolean _gtk_check_menu_item_get_active(long /*int*/ check_menu_item); - public static final boolean gtk_check_menu_item_get_active(long /*int*/ check_menu_item) { + public static final native boolean _gtk_check_menu_item_get_active(long check_menu_item); + public static final boolean gtk_check_menu_item_get_active(long check_menu_item) { lock.lock(); try { return _gtk_check_menu_item_get_active(check_menu_item); @@ -1190,8 +1190,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_check_menu_item_new(); - public static final long /*int*/ gtk_check_menu_item_new() { + public static final native long _gtk_check_menu_item_new(); + public static final long gtk_check_menu_item_new() { lock.lock(); try { return _gtk_check_menu_item_new(); @@ -1203,8 +1203,8 @@ public class GTK extends OS { * @param wid cast=(GtkCheckMenuItem *) * @param active cast=(gboolean) */ - public static final native void _gtk_check_menu_item_set_active(long /*int*/ wid, boolean active); - public static final void gtk_check_menu_item_set_active(long /*int*/ wid, boolean active) { + public static final native void _gtk_check_menu_item_set_active(long wid, boolean active); + public static final void gtk_check_menu_item_set_active(long wid, boolean active) { lock.lock(); try { _gtk_check_menu_item_set_active(wid, active); @@ -1212,8 +1212,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_check_version(int required_major, int required_minor, int required_micro); - public static final long /*int*/ gtk_check_version(int required_major, int required_minor, int required_micro) { + public static final native long _gtk_check_version(int required_major, int required_minor, int required_micro); + public static final long gtk_check_version(int required_major, int required_minor, int required_micro) { lock.lock(); try { return _gtk_check_version(required_major, required_minor, required_micro); @@ -1222,9 +1222,9 @@ public class GTK extends OS { } } /** @param clipboard cast=(GtkClipboard *) */ - public static final native void _gtk_clipboard_clear(long /*int*/ clipboard); + public static final native void _gtk_clipboard_clear(long clipboard); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_clipboard_clear(long /*int*/ clipboard) { + public static final void gtk_clipboard_clear(long clipboard) { lock.lock(); try { _gtk_clipboard_clear(clipboard); @@ -1233,9 +1233,9 @@ public class GTK extends OS { } } /** @param selection cast=(GdkAtom) */ - public static final native long /*int*/ _gtk_clipboard_get(long /*int*/ selection); + public static final native long _gtk_clipboard_get(long selection); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_clipboard_get(long /*int*/ selection) { + public static final long gtk_clipboard_get(long selection) { lock.lock(); try { return _gtk_clipboard_get(selection); @@ -1251,9 +1251,9 @@ public class GTK extends OS { * @param clear_func cast=(GtkClipboardClearFunc) * @param user_data cast=(GObject *) */ - public static final native boolean _gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data); + public static final native boolean _gtk_clipboard_set_with_owner(long clipboard, long target, int n_targets, long get_func, long clear_func, long user_data); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data) { + public static final boolean gtk_clipboard_set_with_owner(long clipboard, long target, int n_targets, long get_func, long clear_func, long user_data) { lock.lock(); try { return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data); @@ -1266,9 +1266,9 @@ public class GTK extends OS { * @param targets cast=(const GtkTargetEntry *) * @param n_targets cast=(gint) */ - public static final native void _gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets); + public static final native void _gtk_clipboard_set_can_store(long clipboard, long targets, int n_targets); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets) { + public static final void gtk_clipboard_set_can_store(long clipboard, long targets, int n_targets) { lock.lock(); try { _gtk_clipboard_set_can_store(clipboard, targets, n_targets); @@ -1279,9 +1279,9 @@ public class GTK extends OS { /** * @param clipboard cast=(GtkClipboard *) */ - public static final native void _gtk_clipboard_store(long /*int*/ clipboard); + public static final native void _gtk_clipboard_store(long clipboard); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_clipboard_store(long /*int*/ clipboard) { + public static final void gtk_clipboard_store(long clipboard) { lock.lock(); try { _gtk_clipboard_store(clipboard); @@ -1293,9 +1293,9 @@ public class GTK extends OS { * @param clipboard cast=(GtkClipboard *) * @param target cast=(GdkAtom) */ - public static final native long /*int*/ _gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target); + public static final native long _gtk_clipboard_wait_for_contents(long clipboard, long target); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) { + public static final long gtk_clipboard_wait_for_contents(long clipboard, long target) { lock.lock(); try { return _gtk_clipboard_wait_for_contents(clipboard, target); @@ -1310,8 +1310,8 @@ public class GTK extends OS { * @param n_colors cast(gint) * @param colors cast=(GdkRGBA *) */ - public static final native void _gtk_color_chooser_add_palette(long /*int*/ chooser, int orientation, int colors_per_line, int n_colors, long /*int*/ colors); - public static final void gtk_color_chooser_add_palette(long /*int*/ chooser, int orientation, int colors_per_line, int n_colors, long /*int*/ colors) { + public static final native void _gtk_color_chooser_add_palette(long chooser, int orientation, int colors_per_line, int n_colors, long colors); + public static final void gtk_color_chooser_add_palette(long chooser, int orientation, int colors_per_line, int n_colors, long colors) { lock.lock(); try { _gtk_color_chooser_add_palette(chooser, orientation, colors_per_line, n_colors, colors); @@ -1323,8 +1323,8 @@ public class GTK extends OS { * @param title cast=(const gchar *) * @param parent cast=(GtkWindow *) */ - public static final native long /*int*/ _gtk_color_chooser_dialog_new (byte[] title, long /*int*/ parent); - public static final long /*int*/ gtk_color_chooser_dialog_new (byte[] title, long /*int*/ parent) { + public static final native long _gtk_color_chooser_dialog_new (byte[] title, long parent); + public static final long gtk_color_chooser_dialog_new (byte[] title, long parent) { lock.lock(); try { return _gtk_color_chooser_dialog_new (title, parent); @@ -1336,8 +1336,8 @@ public class GTK extends OS { * @param chooser cast=(GtkColorChooser *) * @param use_alpha cast=(gboolean) */ - public static final native void _gtk_color_chooser_set_use_alpha (long /*int*/ chooser, boolean use_alpha); - public static final void gtk_color_chooser_set_use_alpha (long /*int*/ chooser, boolean use_alpha) { + public static final native void _gtk_color_chooser_set_use_alpha (long chooser, boolean use_alpha); + public static final void gtk_color_chooser_set_use_alpha (long chooser, boolean use_alpha) { lock.lock(); try { _gtk_color_chooser_set_use_alpha (chooser, use_alpha); @@ -1348,8 +1348,8 @@ public class GTK extends OS { /** * @param chooser cast=(GtkColorChooser *) */ - public static final native boolean _gtk_color_chooser_get_use_alpha (long /*int*/ chooser); - public static final boolean gtk_color_chooser_get_use_alpha (long /*int*/ chooser) { + public static final native boolean _gtk_color_chooser_get_use_alpha (long chooser); + public static final boolean gtk_color_chooser_get_use_alpha (long chooser) { lock.lock(); try { return _gtk_color_chooser_get_use_alpha (chooser); @@ -1361,8 +1361,8 @@ public class GTK extends OS { * @param chooser cast=(GtkColorChooser *) * @param color cast=(GdkRGBA *) */ - public static final native void _gtk_color_chooser_set_rgba(long /*int*/ chooser, GdkRGBA color); - public static final void gtk_color_chooser_get_rgba(long /*int*/ chooser, GdkRGBA color) { + public static final native void _gtk_color_chooser_set_rgba(long chooser, GdkRGBA color); + public static final void gtk_color_chooser_get_rgba(long chooser, GdkRGBA color) { lock.lock(); try { _gtk_color_chooser_get_rgba(chooser, color); @@ -1374,8 +1374,8 @@ public class GTK extends OS { * @param chooser cast=(GtkColorChooser *) * @param color cast=(GdkRGBA *) */ - public static final native void _gtk_color_chooser_get_rgba(long /*int*/ chooser, GdkRGBA color); - public static final void gtk_color_chooser_set_rgba(long /*int*/ chooser, GdkRGBA color) { + public static final native void _gtk_color_chooser_get_rgba(long chooser, GdkRGBA color); + public static final void gtk_color_chooser_set_rgba(long chooser, GdkRGBA color) { lock.lock(); try { _gtk_color_chooser_set_rgba(chooser, color); @@ -1388,9 +1388,9 @@ public class GTK extends OS { * @param combo cast=(GtkComboBox *) * @param val cast=(gboolean) */ - public static final native void _gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val); + public static final native void _gtk_combo_box_set_focus_on_click(long combo, boolean val); /** [GTK2/GTK3; 3.20 deprecated, replaced] */ - public static final void gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val) { + public static final void gtk_combo_box_set_focus_on_click(long combo, boolean val) { lock.lock(); try { _gtk_combo_box_set_focus_on_click(combo, val); @@ -1398,8 +1398,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_combo_box_text_new(); - public static final long /*int*/ gtk_combo_box_text_new() { + public static final native long _gtk_combo_box_text_new(); + public static final long gtk_combo_box_text_new() { lock.lock(); try { return _gtk_combo_box_text_new(); @@ -1407,8 +1407,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_combo_box_text_new_with_entry(); - public static final long /*int*/ gtk_combo_box_text_new_with_entry() { + public static final native long _gtk_combo_box_text_new_with_entry(); + public static final long gtk_combo_box_text_new_with_entry() { lock.lock(); try { return _gtk_combo_box_text_new_with_entry(); @@ -1422,9 +1422,9 @@ public class GTK extends OS { * @param id cast=(const gchar *) * @param text cast=(const gchar *) */ - public static final native void _gtk_combo_box_text_insert(long /*int*/ combo_box, int position, byte[] id, byte[] text); + public static final native void _gtk_combo_box_text_insert(long combo_box, int position, byte[] id, byte[] text); /** Do not call directly, instead use Combo.gtk_combo_box_insert(..) */ - public static final void gtk_combo_box_text_insert(long /*int*/ combo_box, int position, byte[] id, byte[] text) { + public static final void gtk_combo_box_text_insert(long combo_box, int position, byte[] id, byte[] text) { lock.lock(); try { _gtk_combo_box_text_insert(combo_box, position, id, text); @@ -1433,8 +1433,8 @@ public class GTK extends OS { } } /** @param combo_box cast=(GtkComboBoxText *) */ - public static final native void _gtk_combo_box_text_remove(long /*int*/ combo_box, int position); - public static final void gtk_combo_box_text_remove(long /*int*/ combo_box, int position) { + public static final native void _gtk_combo_box_text_remove(long combo_box, int position); + public static final void gtk_combo_box_text_remove(long combo_box, int position) { lock.lock(); try { _gtk_combo_box_text_remove(combo_box, position); @@ -1445,9 +1445,9 @@ public class GTK extends OS { /** * @param combo_box cast=(GtkComboBoxText *) */ - public static final native void _gtk_combo_box_text_remove_all(long /*int*/ combo_box); + public static final native void _gtk_combo_box_text_remove_all(long combo_box); /** Do not call directly. Call Combo.gtk_combo_box_text_remove_all(..) instead). */ - public static final void gtk_combo_box_text_remove_all(long /*int*/ combo_box) { + public static final void gtk_combo_box_text_remove_all(long combo_box) { lock.lock(); try { _gtk_combo_box_text_remove_all(combo_box); @@ -1458,8 +1458,8 @@ public class GTK extends OS { /** * @param combo_box cast=(GtkComboBox *) */ - public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box); - public static final int gtk_combo_box_get_active(long /*int*/ combo_box) { + public static final native int _gtk_combo_box_get_active(long combo_box); + public static final int gtk_combo_box_get_active(long combo_box) { lock.lock(); try { return _gtk_combo_box_get_active(combo_box); @@ -1470,8 +1470,8 @@ public class GTK extends OS { /** * @param combo_box cast=(GtkComboBox *) */ - public static final native long /*int*/ _gtk_combo_box_get_model(long /*int*/ combo_box); - public static final long /*int*/ gtk_combo_box_get_model(long /*int*/ combo_box) { + public static final native long _gtk_combo_box_get_model(long combo_box); + public static final long gtk_combo_box_get_model(long combo_box) { lock.lock(); try { return _gtk_combo_box_get_model(combo_box); @@ -1483,8 +1483,8 @@ public class GTK extends OS { * @param combo_box cast=(GtkComboBox *) * @param index cast=(gint) */ - public static final native void _gtk_combo_box_set_active(long /*int*/ combo_box, int index); - public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int index) { + public static final native void _gtk_combo_box_set_active(long combo_box, int index); + public static final void gtk_combo_box_set_active(long combo_box, int index) { lock.lock(); try { _gtk_combo_box_set_active(combo_box, index); @@ -1496,11 +1496,11 @@ public class GTK extends OS { * @param combo_box cast=(GtkComboBox *) * @param width cast=(gint) */ - public static final native void _gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width); + public static final native void _gtk_combo_box_set_wrap_width(long combo_box, int width); /** * Do not use directly. Instead use Combo.gtk_combo_box_toggle_wrap(..) */ - public static final void gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width) { + public static final void gtk_combo_box_set_wrap_width(long combo_box, int width) { lock.lock(); try { _gtk_combo_box_set_wrap_width(combo_box, width); @@ -1513,8 +1513,8 @@ public class GTK extends OS { * @param combo_box cast=(GtkComboBox *) * @return cast=(gint) */ - public static final native int _gtk_combo_box_get_wrap_width(long /*int*/ combo_box); - public static final int gtk_combo_box_get_wrap_width(long /*int*/ combo_box) { + public static final native int _gtk_combo_box_get_wrap_width(long combo_box); + public static final int gtk_combo_box_get_wrap_width(long combo_box) { lock.lock(); try { return _gtk_combo_box_get_wrap_width(combo_box); @@ -1525,8 +1525,8 @@ public class GTK extends OS { /** * @param combo_box cast=(GtkComboBox *) */ - public static final native void _gtk_combo_box_popup(long /*int*/ combo_box); - public static final void gtk_combo_box_popup(long /*int*/ combo_box) { + public static final native void _gtk_combo_box_popup(long combo_box); + public static final void gtk_combo_box_popup(long combo_box) { lock.lock(); try { _gtk_combo_box_popup(combo_box); @@ -1537,8 +1537,8 @@ public class GTK extends OS { /** * @param combo_box cast=(GtkComboBox *) */ - public static final native void _gtk_combo_box_popdown(long /*int*/ combo_box); - public static final void gtk_combo_box_popdown(long /*int*/ combo_box) { + public static final native void _gtk_combo_box_popdown(long combo_box); + public static final void gtk_combo_box_popdown(long combo_box) { lock.lock(); try { _gtk_combo_box_popdown(combo_box); @@ -1550,8 +1550,8 @@ public class GTK extends OS { * @param container cast=(GtkContainer *) * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_container_add(long /*int*/ container, long /*int*/ widget); - public static final void gtk_container_add(long /*int*/ container, long /*int*/ widget) { + public static final native void _gtk_container_add(long container, long widget); + public static final void gtk_container_add(long container, long widget) { lock.lock(); try { _gtk_container_add(container, widget); @@ -1567,8 +1567,8 @@ public class GTK extends OS { * @param callback cast=(GtkCallback) * @param callback_data cast=(gpointer) */ - public static final native void _gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data); - public static final void gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data) { + public static final native void _gtk_container_forall(long container, long callback, long callback_data); + public static final void gtk_container_forall(long container, long callback, long callback_data) { lock.lock(); try { _gtk_container_forall(container, callback, callback_data); @@ -1581,9 +1581,9 @@ public class GTK extends OS { * @param child cast=(GtkWidget *) * @param cairo cast=(cairo_t *) */ - public static final native void _gtk_container_propagate_draw(long /*int*/ container, long /*int*/ child, long /*int*/ cairo); + public static final native void _gtk_container_propagate_draw(long container, long child, long cairo); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_container_propagate_draw(long /*int*/ container, long /*int*/ child, long /*int*/ cairo) { + public static final void gtk_container_propagate_draw(long container, long child, long cairo) { lock.lock(); try { _gtk_container_propagate_draw(container, child, cairo); @@ -1594,9 +1594,9 @@ public class GTK extends OS { /** * @param container cast=(GtkContainer *) */ - public static final native int _gtk_container_get_border_width(long /*int*/ container); + public static final native int _gtk_container_get_border_width(long container); /** [GTK3 only, if-def'd in os.h] */ - public static final int gtk_container_get_border_width(long /*int*/ container) { + public static final int gtk_container_get_border_width(long container) { lock.lock(); try { return _gtk_container_get_border_width(container); @@ -1605,8 +1605,8 @@ public class GTK extends OS { } } /** @param container cast=(GtkContainer *) */ - public static final native long /*int*/ _gtk_container_get_children(long /*int*/ container); - public static final long /*int*/ gtk_container_get_children(long /*int*/ container) { + public static final native long _gtk_container_get_children(long container); + public static final long gtk_container_get_children(long container) { lock.lock(); try { return _gtk_container_get_children(container); @@ -1618,8 +1618,8 @@ public class GTK extends OS { * @param container cast=(GtkContainer *) * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_container_remove(long /*int*/ container, long /*int*/ widget); - public static final void gtk_container_remove(long /*int*/ container, long /*int*/ widget) { + public static final native void _gtk_container_remove(long container, long widget); + public static final void gtk_container_remove(long container, long widget) { lock.lock(); try { _gtk_container_remove(container, widget); @@ -1631,9 +1631,9 @@ public class GTK extends OS { * @param container cast=(GtkContainer *) * @param border_width cast=(guint) */ - public static final native void _gtk_container_set_border_width(long /*int*/ container, int border_width); + public static final native void _gtk_container_set_border_width(long container, int border_width); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_container_set_border_width(long /*int*/ container, int border_width) { + public static final void gtk_container_set_border_width(long container, int border_width) { lock.lock(); try { _gtk_container_set_border_width(container, border_width); @@ -1646,8 +1646,8 @@ public class GTK extends OS { * @param button_text cast=(const gchar *) * @param response_id cast=(gint) */ - public static final native long /*int*/ _gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id); - public static final long /*int*/ gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id) { + public static final native long _gtk_dialog_add_button(long dialog, byte[] button_text, int response_id); + public static final long gtk_dialog_add_button(long dialog, byte[] button_text, int response_id) { lock.lock(); try { return _gtk_dialog_add_button(dialog, button_text, response_id); @@ -1656,8 +1656,8 @@ public class GTK extends OS { } } /** @param dialog cast=(GtkDialog *) */ - public static final native int _gtk_dialog_run(long /*int*/ dialog); - public static final int gtk_dialog_run(long /*int*/ dialog) { + public static final native int _gtk_dialog_run(long dialog); + public static final int gtk_dialog_run(long dialog) { lock.lock(); try { return _gtk_dialog_run(dialog); @@ -1675,9 +1675,9 @@ public class GTK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native long /*int*/ _gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event, int x, int y); + public static final native long _gtk_drag_begin_with_coordinates(long widget, long targets, int actions, int button, long event, int x, int y); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event, int x, int y) { + public static final long gtk_drag_begin_with_coordinates(long widget, long targets, int actions, int button, long event, int x, int y) { lock.lock(); try { return _gtk_drag_begin_with_coordinates(widget, targets, actions, button, event, x, y); @@ -1693,9 +1693,9 @@ public class GTK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native long /*int*/ _gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ device, long /*int*/ targets, int actions, int x, int y); + public static final native long _gtk_drag_begin_with_coordinates(long widget, long device, long targets, int actions, int x, int y); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ device, long /*int*/ targets, int actions, int x, int y) { + public static final long gtk_drag_begin_with_coordinates(long widget, long device, long targets, int actions, int x, int y) { lock.lock(); try { return _gtk_drag_begin_with_coordinates(widget, device, targets, actions, x, y); @@ -1710,8 +1710,8 @@ public class GTK extends OS { * @param current_x cast=(gint) * @param current_y cast=(gint) */ - public static final native boolean _gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y); - public static final boolean gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y) { + public static final native boolean _gtk_drag_check_threshold(long widget, int start_x, int start_y, int current_x, int current_y); + public static final boolean gtk_drag_check_threshold(long widget, int start_x, int start_y, int current_x, int current_y) { lock.lock(); try { return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y); @@ -1724,9 +1724,9 @@ public class GTK extends OS { * @param context cast=(GdkDragContext *) * @param target_list cast=(GtkTargetList *) */ - public static final native long /*int*/ _gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list); + public static final native long _gtk_drag_dest_find_target(long widget, long context, long target_list); /** [GTK3/GTK4: both have identical signatures but accept differing parameters at the native level] */ - public static final long /*int*/ gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list) { + public static final long gtk_drag_dest_find_target(long widget, long context, long target_list) { lock.lock(); try { return _gtk_drag_dest_find_target(widget, context, target_list); @@ -1741,9 +1741,9 @@ public class GTK extends OS { * @param n_targets cast=(gint) * @param actions cast=(GdkDragAction) */ - public static final native void _gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions); + public static final native void _gtk_drag_dest_set(long widget, int flags, long targets, int n_targets, int actions); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions) { + public static final void gtk_drag_dest_set(long widget, int flags, long targets, int n_targets, int actions) { lock.lock(); try { _gtk_drag_dest_set(widget, flags, targets, n_targets, actions); @@ -1752,8 +1752,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_drag_dest_unset(long /*int*/ widget); - public static final void gtk_drag_dest_unset(long /*int*/ widget) { + public static final native void _gtk_drag_dest_unset(long widget); + public static final void gtk_drag_dest_unset(long widget) { lock.lock(); try { _gtk_drag_dest_unset(widget); @@ -1767,9 +1767,9 @@ public class GTK extends OS { * @param delete cast=(gboolean) * @param time cast=(guint32) */ - public static final native void _gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time); + public static final native void _gtk_drag_finish(long context, boolean success, boolean delete, int time); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time) { + public static final void gtk_drag_finish(long context, boolean success, boolean delete, int time) { lock.lock(); try { _gtk_drag_finish(context, success, delete, time); @@ -1783,9 +1783,9 @@ public class GTK extends OS { * @param target cast=(GdkAtom) * @param time cast=(guint32) */ - public static final native void _gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time); + public static final native void _gtk_drag_get_data(long widget, long context, long target, int time); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time) { + public static final void gtk_drag_get_data(long widget, long context, long target, int time) { lock.lock(); try { _gtk_drag_get_data(widget, context, target, time); @@ -1798,9 +1798,9 @@ public class GTK extends OS { * @param drop cast=(GdkDrop *) * @param target cast=(GdkAtom) */ - public static final native void _gtk_drag_get_data(long /*int*/ widget, long /*int*/ drop, long /*int*/ target); + public static final native void _gtk_drag_get_data(long widget, long drop, long target); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_drag_get_data(long /*int*/ widget, long /*int*/ drop, long /*int*/ target) { + public static final void gtk_drag_get_data(long widget, long drop, long target) { lock.lock(); try { _gtk_drag_get_data(widget, drop, target); @@ -1812,9 +1812,9 @@ public class GTK extends OS { * @param context cast=(GdkDragContext *) * @param surface cast=(cairo_surface_t *) */ - public static final native void _gtk_drag_set_icon_surface(long /*int*/ context, long /*int*/ surface); + public static final native void _gtk_drag_set_icon_surface(long context, long surface); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_drag_set_icon_surface(long /*int*/ context, long /*int*/ surface) { + public static final void gtk_drag_set_icon_surface(long context, long surface) { lock.lock(); try { _gtk_drag_set_icon_surface(context, surface); @@ -1823,8 +1823,8 @@ public class GTK extends OS { } } /** @param editable cast=(GtkEditable *) */ - public static final native void _gtk_editable_copy_clipboard(long /*int*/ editable); - public static final void gtk_editable_copy_clipboard(long /*int*/ editable) { + public static final native void _gtk_editable_copy_clipboard(long editable); + public static final void gtk_editable_copy_clipboard(long editable) { lock.lock(); try { _gtk_editable_copy_clipboard(editable); @@ -1833,8 +1833,8 @@ public class GTK extends OS { } } /** @param editable cast=(GtkEditable *) */ - public static final native void _gtk_editable_cut_clipboard(long /*int*/ editable); - public static final void gtk_editable_cut_clipboard(long /*int*/ editable) { + public static final native void _gtk_editable_cut_clipboard(long editable); + public static final void gtk_editable_cut_clipboard(long editable) { lock.lock(); try { _gtk_editable_cut_clipboard(editable); @@ -1843,8 +1843,8 @@ public class GTK extends OS { } } /** @param editable cast=(GtkEditable *) */ - public static final native void _gtk_editable_delete_selection(long /*int*/ editable); - public static final void gtk_editable_delete_selection(long /*int*/ editable) { + public static final native void _gtk_editable_delete_selection(long editable); + public static final void gtk_editable_delete_selection(long editable) { lock.lock(); try { _gtk_editable_delete_selection(editable); @@ -1857,8 +1857,8 @@ public class GTK extends OS { * @param start_pos cast=(gint) * @param end_pos cast=(gint) */ - public static final native void _gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos); - public static final void gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos) { + public static final native void _gtk_editable_delete_text(long editable, int start_pos, int end_pos); + public static final void gtk_editable_delete_text(long editable, int start_pos, int end_pos) { lock.lock(); try { _gtk_editable_delete_text(editable, start_pos, end_pos); @@ -1867,8 +1867,8 @@ public class GTK extends OS { } } /** @param editable cast=(GtkEditable *) */ - public static final native boolean _gtk_editable_get_editable(long /*int*/ editable); - public static final boolean gtk_editable_get_editable(long /*int*/ editable) { + public static final native boolean _gtk_editable_get_editable(long editable); + public static final boolean gtk_editable_get_editable(long editable) { lock.lock(); try { return _gtk_editable_get_editable(editable); @@ -1877,8 +1877,8 @@ public class GTK extends OS { } } /** @param editable cast=(GtkEditable *) */ - public static final native int _gtk_editable_get_position(long /*int*/ editable); - public static final int gtk_editable_get_position(long /*int*/ editable) { + public static final native int _gtk_editable_get_position(long editable); + public static final int gtk_editable_get_position(long editable) { lock.lock(); try { return _gtk_editable_get_position(editable); @@ -1891,8 +1891,8 @@ public class GTK extends OS { * @param start cast=(gint *) * @param end cast=(gint *) */ - public static final native boolean _gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end); - public static final boolean gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end) { + public static final native boolean _gtk_editable_get_selection_bounds(long editable, int[] start, int[] end); + public static final boolean gtk_editable_get_selection_bounds(long editable, int[] start, int[] end) { lock.lock(); try { return _gtk_editable_get_selection_bounds(editable, start, end); @@ -1906,8 +1906,8 @@ public class GTK extends OS { * @param new_text_length cast=(gint) * @param position cast=(gint *) */ - public static final native void _gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position); - public static final void gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position) { + public static final native void _gtk_editable_insert_text(long editable, byte[] new_text, int new_text_length, int[] position); + public static final void gtk_editable_insert_text(long editable, byte[] new_text, int new_text_length, int[] position) { lock.lock(); try { _gtk_editable_insert_text(editable, new_text, new_text_length, position); @@ -1916,8 +1916,8 @@ public class GTK extends OS { } } /** @param editable cast=(GtkEditable *) */ - public static final native void _gtk_editable_paste_clipboard(long /*int*/ editable); - public static final void gtk_editable_paste_clipboard(long /*int*/ editable) { + public static final native void _gtk_editable_paste_clipboard(long editable); + public static final void gtk_editable_paste_clipboard(long editable) { lock.lock(); try { _gtk_editable_paste_clipboard(editable); @@ -1930,8 +1930,8 @@ public class GTK extends OS { * @param start cast=(gint) * @param end cast=(gint) */ - public static final native void _gtk_editable_select_region(long /*int*/ editable, int start, int end); - public static final void gtk_editable_select_region(long /*int*/ editable, int start, int end) { + public static final native void _gtk_editable_select_region(long editable, int start, int end); + public static final void gtk_editable_select_region(long editable, int start, int end) { lock.lock(); try { _gtk_editable_select_region(editable, start, end); @@ -1943,8 +1943,8 @@ public class GTK extends OS { * @param entry cast=(GtkEditable *) * @param editable cast=(gboolean) */ - public static final native void _gtk_editable_set_editable(long /*int*/ entry, boolean editable); - public static final void gtk_editable_set_editable(long /*int*/ entry, boolean editable) { + public static final native void _gtk_editable_set_editable(long entry, boolean editable); + public static final void gtk_editable_set_editable(long entry, boolean editable) { lock.lock(); try { _gtk_editable_set_editable(entry, editable); @@ -1956,8 +1956,8 @@ public class GTK extends OS { * @param editable cast=(GtkEditable *) * @param position cast=(gint) */ - public static final native void _gtk_editable_set_position(long /*int*/ editable, int position); - public static final void gtk_editable_set_position(long /*int*/ editable, int position) { + public static final native void _gtk_editable_set_position(long editable, int position); + public static final void gtk_editable_set_position(long editable, int position) { lock.lock(); try { _gtk_editable_set_position(editable, position); @@ -1969,8 +1969,8 @@ public class GTK extends OS { * @param self cast=(GtkEntry *) * @param n_chars cast=(gint) */ - public static final native void _gtk_entry_set_width_chars (long /*int*/ self, int n_chars); - public static final void gtk_entry_set_width_chars (long /*int*/ self, int n_chars) { + public static final native void _gtk_entry_set_width_chars (long self, int n_chars); + public static final void gtk_entry_set_width_chars (long self, int n_chars) { lock.lock(); try { _gtk_entry_set_width_chars(self, n_chars); @@ -1979,8 +1979,8 @@ public class GTK extends OS { } } /** @param entry cast=(GtkEntry *) */ - public static final native char _gtk_entry_get_invisible_char(long /*int*/ entry); - public static final char gtk_entry_get_invisible_char(long /*int*/ entry) { + public static final native char _gtk_entry_get_invisible_char(long entry); + public static final char gtk_entry_get_invisible_char(long entry) { lock.lock(); try { return _gtk_entry_get_invisible_char(entry); @@ -1989,8 +1989,8 @@ public class GTK extends OS { } } /** @param entry cast=(GtkEntry *) */ - public static final native long /*int*/ _gtk_entry_get_layout (long /*int*/ entry); - public static final long /*int*/ gtk_entry_get_layout (long /*int*/ entry) { + public static final native long _gtk_entry_get_layout (long entry); + public static final long gtk_entry_get_layout (long entry) { lock.lock(); try { return _gtk_entry_get_layout(entry); @@ -2003,8 +2003,8 @@ public class GTK extends OS { * @param x cast=(gint *) * @param y cast=(gint *) */ - public static final native void _gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y); - public static final void gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y) { + public static final native void _gtk_entry_get_layout_offsets (long entry, int[] x, int[] y); + public static final void gtk_entry_get_layout_offsets (long entry, int[] x, int[] y) { lock.lock(); try { _gtk_entry_get_layout_offsets(entry, x, y); @@ -2016,8 +2016,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param index cast=(gint) */ - public static final native int _gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index); - public static final int gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index) { + public static final native int _gtk_entry_text_index_to_layout_index (long entry, int index); + public static final int gtk_entry_text_index_to_layout_index (long entry, int index) { lock.lock(); try { return _gtk_entry_text_index_to_layout_index(entry, index); @@ -2030,8 +2030,8 @@ public class GTK extends OS { * @param icon_pos cast=(gint) * @param icon_area cast=(GdkRectangle *),flags=no_in */ - public static final native void _gtk_entry_get_icon_area(long /*int*/ entry, int icon_pos, GdkRectangle icon_area); - public static final void gtk_entry_get_icon_area(long /*int*/ entry, int icon_pos, GdkRectangle icon_area) { + public static final native void _gtk_entry_get_icon_area(long entry, int icon_pos, GdkRectangle icon_area); + public static final void gtk_entry_get_icon_area(long entry, int icon_pos, GdkRectangle icon_area) { lock.lock(); try { _gtk_entry_get_icon_area(entry, icon_pos, icon_area); @@ -2040,8 +2040,8 @@ public class GTK extends OS { } } /** @param entry cast=(GtkEntry *) */ - public static final native int _gtk_entry_get_max_length(long /*int*/ entry); - public static final int gtk_entry_get_max_length(long /*int*/ entry) { + public static final native int _gtk_entry_get_max_length(long entry); + public static final int gtk_entry_get_max_length(long entry) { lock.lock(); try { return _gtk_entry_get_max_length(entry); @@ -2050,8 +2050,8 @@ public class GTK extends OS { } } /** @param entry cast=(GtkEntry *) */ - public static final native long /*int*/ _gtk_entry_get_text(long /*int*/ entry); - public static final long /*int*/ gtk_entry_get_text(long /*int*/ entry) { + public static final native long _gtk_entry_get_text(long entry); + public static final long gtk_entry_get_text(long entry) { lock.lock(); try { return _gtk_entry_get_text(entry); @@ -2060,8 +2060,8 @@ public class GTK extends OS { } } /** @param entry cast=(GtkEntry *) */ - public static final native boolean _gtk_entry_get_visibility(long /*int*/ entry); - public static final boolean gtk_entry_get_visibility(long /*int*/ entry) { + public static final native boolean _gtk_entry_get_visibility(long entry); + public static final boolean gtk_entry_get_visibility(long entry) { lock.lock(); try { return _gtk_entry_get_visibility(entry); @@ -2069,8 +2069,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_entry_new(); - public static final long /*int*/ gtk_entry_new() { + public static final native long _gtk_entry_new(); + public static final long gtk_entry_new() { lock.lock(); try { return _gtk_entry_new(); @@ -2082,8 +2082,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param xalign cast=(gfloat) */ - public static final native void _gtk_entry_set_alignment(long /*int*/ entry, float xalign); - public static final void gtk_entry_set_alignment(long /*int*/ entry, float xalign) { + public static final native void _gtk_entry_set_alignment(long entry, float xalign); + public static final void gtk_entry_set_alignment(long entry, float xalign) { lock.lock(); try { _gtk_entry_set_alignment(entry, xalign); @@ -2095,8 +2095,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param setting cast=(gboolean) */ - public static final native void _gtk_entry_set_has_frame(long /*int*/ entry, boolean setting); - public static final void gtk_entry_set_has_frame(long /*int*/ entry, boolean setting) { + public static final native void _gtk_entry_set_has_frame(long entry, boolean setting); + public static final void gtk_entry_set_has_frame(long entry, boolean setting) { lock.lock(); try { _gtk_entry_set_has_frame(entry, setting); @@ -2109,8 +2109,8 @@ public class GTK extends OS { * @param iconPos cast=(gint) * @param stock cast=(const gchar *) */ - public static final native void _gtk_entry_set_icon_from_icon_name(long /*int*/ entry, int iconPos, byte[] stock); - public static final void gtk_entry_set_icon_from_icon_name(long /*int*/ entry, int iconPos, byte[] iconName) { + public static final native void _gtk_entry_set_icon_from_icon_name(long entry, int iconPos, byte[] stock); + public static final void gtk_entry_set_icon_from_icon_name(long entry, int iconPos, byte[] iconName) { lock.lock(); try { _gtk_entry_set_icon_from_icon_name(entry, iconPos, iconName); @@ -2123,8 +2123,8 @@ public class GTK extends OS { * @param icon_pos cast=(GtkEntryIconPosition) * @param activatable cast=(gboolean) */ - public static final native void _gtk_entry_set_icon_activatable(long /*int*/ entry, int icon_pos, boolean activatable); - public static final void gtk_entry_set_icon_activatable(long /*int*/ entry, int icon_pos, boolean activatable) { + public static final native void _gtk_entry_set_icon_activatable(long entry, int icon_pos, boolean activatable); + public static final void gtk_entry_set_icon_activatable(long entry, int icon_pos, boolean activatable) { lock.lock(); try { _gtk_entry_set_icon_activatable(entry, icon_pos, activatable); @@ -2137,8 +2137,8 @@ public class GTK extends OS { * @param icon_pos cast=(GtkEntryIconPosition) * @param sensitive cast=(gboolean) */ - public static final native void _gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive); - public static final void gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive) { + public static final native void _gtk_entry_set_icon_sensitive(long entry, int icon_pos, boolean sensitive); + public static final void gtk_entry_set_icon_sensitive(long entry, int icon_pos, boolean sensitive) { lock.lock(); try { _gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive); @@ -2150,8 +2150,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param ch cast=(gint) */ - public static final native void _gtk_entry_set_invisible_char(long /*int*/ entry, char ch); - public static final void gtk_entry_set_invisible_char(long /*int*/ entry, char ch) { + public static final native void _gtk_entry_set_invisible_char(long entry, char ch); + public static final void gtk_entry_set_invisible_char(long entry, char ch) { lock.lock(); try { _gtk_entry_set_invisible_char(entry, ch); @@ -2163,8 +2163,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param max cast=(gint) */ - public static final native void _gtk_entry_set_max_length(long /*int*/ entry, int max); - public static final void gtk_entry_set_max_length(long /*int*/ entry, int max) { + public static final native void _gtk_entry_set_max_length(long entry, int max); + public static final void gtk_entry_set_max_length(long entry, int max) { lock.lock(); try { _gtk_entry_set_max_length(entry, max); @@ -2176,8 +2176,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param tabs cast=(PangoTabArray *) */ - public static final native void _gtk_entry_set_tabs(long /*int*/ entry, long /*int*/ tabs); - public static final void gtk_entry_set_tabs(long /*int*/ entry, long /*int*/ tabs) { + public static final native void _gtk_entry_set_tabs(long entry, long tabs); + public static final void gtk_entry_set_tabs(long entry, long tabs) { lock.lock(); try { _gtk_entry_set_tabs(entry, tabs); @@ -2189,8 +2189,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param text cast=(const gchar *) */ - public static final native void _gtk_entry_set_text(long /*int*/ entry, byte[] text); - public static final void gtk_entry_set_text(long /*int*/ entry, byte[] text) { + public static final native void _gtk_entry_set_text(long entry, byte[] text); + public static final void gtk_entry_set_text(long entry, byte[] text) { lock.lock(); try { _gtk_entry_set_text(entry, text); @@ -2202,8 +2202,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param text cast=(const gchar *) */ - public static final native void _gtk_entry_set_placeholder_text(long /*int*/ entry, byte[] text); - public static final void gtk_entry_set_placeholder_text(long /*int*/ entry, byte[] text) { + public static final native void _gtk_entry_set_placeholder_text(long entry, byte[] text); + public static final void gtk_entry_set_placeholder_text(long entry, byte[] text) { lock.lock(); try { _gtk_entry_set_placeholder_text(entry, text); @@ -2215,8 +2215,8 @@ public class GTK extends OS { * @param entry cast=(GtkEntry *) * @param visible cast=(gboolean) */ - public static final native void _gtk_entry_set_visibility(long /*int*/ entry, boolean visible); - public static final void gtk_entry_set_visibility(long /*int*/ entry, boolean visible) { + public static final native void _gtk_entry_set_visibility(long entry, boolean visible); + public static final void gtk_entry_set_visibility(long entry, boolean visible) { lock.lock(); try { _gtk_entry_set_visibility(entry, visible); @@ -2225,8 +2225,8 @@ public class GTK extends OS { } } /** @param expander cast=(GtkExpander *) */ - public static final native boolean _gtk_expander_get_expanded(long /*int*/ expander); - public static final boolean gtk_expander_get_expanded(long /*int*/ expander) { + public static final native boolean _gtk_expander_get_expanded(long expander); + public static final boolean gtk_expander_get_expanded(long expander) { lock.lock(); try { return _gtk_expander_get_expanded(expander); @@ -2237,8 +2237,8 @@ public class GTK extends OS { /** * @param label cast=(const gchar *) */ - public static final native long /*int*/ _gtk_expander_new(byte[] label); - public static final long /*int*/ gtk_expander_new(byte[] label) { + public static final native long _gtk_expander_new(byte[] label); + public static final long gtk_expander_new(byte[] label) { lock.lock(); try { return _gtk_expander_new(label); @@ -2247,8 +2247,8 @@ public class GTK extends OS { } } /** @param expander cast=(GtkExpander *) */ - public static final native void _gtk_expander_set_expanded(long /*int*/ expander, boolean expanded); - public static final void gtk_expander_set_expanded(long /*int*/ expander, boolean expanded) { + public static final native void _gtk_expander_set_expanded(long expander, boolean expanded); + public static final void gtk_expander_set_expanded(long expander, boolean expanded) { lock.lock(); try { _gtk_expander_set_expanded(expander, expanded); @@ -2260,8 +2260,8 @@ public class GTK extends OS { * @param expander cast=(GtkExpander *) * @param label_widget cast=(GtkWidget *) */ - public static final native void _gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget); - public static final void gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget) { + public static final native void _gtk_expander_set_label_widget(long expander, long label_widget); + public static final void gtk_expander_set_label_widget(long expander, long label_widget) { lock.lock(); try { _gtk_expander_set_label_widget(expander, label_widget); @@ -2273,8 +2273,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param filter cast=(GtkFileFilter *) */ - public static final native void _gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter); - public static final void gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter) { + public static final native void _gtk_file_chooser_add_filter(long chooser, long filter); + public static final void gtk_file_chooser_add_filter(long chooser, long filter) { lock.lock(); try { _gtk_file_chooser_add_filter(chooser, filter); @@ -2288,8 +2288,8 @@ public class GTK extends OS { * @param first_button_text cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ - public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long /*int*/ terminator); - public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long /*int*/ terminator) { + public static final native long _gtk_file_chooser_dialog_new(byte[] title, long parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long terminator); + public static final long gtk_file_chooser_dialog_new(byte[] title, long parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long terminator) { 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); @@ -2303,8 +2303,8 @@ public class GTK extends OS { * @param first_button_text cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ - public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator); - public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator) { + public static final native long _gtk_file_chooser_dialog_new(byte[] title, long parent, int action, long first_button_text, int first_button_id, long second_button_text, int second_button_id, long terminator); + public static final long gtk_file_chooser_dialog_new(byte[] title, long parent, int action, long first_button_text, int first_button_id, long second_button_text, int second_button_id, long terminator) { 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); @@ -2313,8 +2313,8 @@ public class GTK extends OS { } } /** @param chooser cast=(GtkFileChooser *) */ - public static final native long /*int*/ _gtk_file_chooser_get_filename(long /*int*/ chooser); - public static final long /*int*/ gtk_file_chooser_get_filename(long /*int*/ chooser) { + public static final native long _gtk_file_chooser_get_filename(long chooser); + public static final long gtk_file_chooser_get_filename(long chooser) { lock.lock(); try { return _gtk_file_chooser_get_filename(chooser); @@ -2323,8 +2323,8 @@ public class GTK extends OS { } } /** @param chooser cast=(GtkFileChooser *) */ - public static final native long /*int*/ _gtk_file_chooser_get_filenames(long /*int*/ chooser); - public static final long /*int*/ gtk_file_chooser_get_filenames(long /*int*/ chooser) { + public static final native long _gtk_file_chooser_get_filenames(long chooser); + public static final long gtk_file_chooser_get_filenames(long chooser) { lock.lock(); try { return _gtk_file_chooser_get_filenames(chooser); @@ -2333,8 +2333,8 @@ public class GTK extends OS { } } /** @param chooser cast=(GtkFileChooser *) */ - public static final native long /*int*/ _gtk_file_chooser_get_uri(long /*int*/ chooser); - public static final long /*int*/ gtk_file_chooser_get_uri(long /*int*/ chooser) { + public static final native long _gtk_file_chooser_get_uri(long chooser); + public static final long gtk_file_chooser_get_uri(long chooser) { lock.lock(); try { return _gtk_file_chooser_get_uri(chooser); @@ -2343,8 +2343,8 @@ public class GTK extends OS { } } /** @param chooser cast=(GtkFileChooser *) */ - public static final native long /*int*/ _gtk_file_chooser_get_uris(long /*int*/ chooser); - public static final long /*int*/ gtk_file_chooser_get_uris(long /*int*/ chooser) { + public static final native long _gtk_file_chooser_get_uris(long chooser); + public static final long gtk_file_chooser_get_uris(long chooser) { lock.lock(); try { return _gtk_file_chooser_get_uris(chooser); @@ -2353,8 +2353,8 @@ public class GTK extends OS { } } /** @param chooser cast=(GtkFileChooser *) */ - public static final native long /*int*/ _gtk_file_chooser_get_filter(long /*int*/ chooser); - public static final long /*int*/ gtk_file_chooser_get_filter(long /*int*/ chooser) { + public static final native long _gtk_file_chooser_get_filter(long chooser); + public static final long gtk_file_chooser_get_filter(long chooser) { lock.lock(); try { return _gtk_file_chooser_get_filter(chooser); @@ -2366,8 +2366,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param filename cast=(const gchar *) */ - public static final native void _gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename); - public static final void gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename) { + public static final native void _gtk_file_chooser_set_current_folder(long chooser, long filename); + public static final void gtk_file_chooser_set_current_folder(long chooser, long filename) { lock.lock(); try { _gtk_file_chooser_set_current_folder(chooser, filename); @@ -2379,8 +2379,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param uri cast=(const gchar *) */ - public static final native void _gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri); - public static final void gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri) { + public static final native void _gtk_file_chooser_set_current_folder_uri(long chooser, byte [] uri); + public static final void gtk_file_chooser_set_current_folder_uri(long chooser, byte [] uri) { lock.lock(); try { _gtk_file_chooser_set_current_folder_uri(chooser, uri); @@ -2392,8 +2392,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param name cast=(const gchar *) */ - public static final native void _gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name); - public static final void gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name) { + public static final native void _gtk_file_chooser_set_current_name(long chooser, byte[] name); + public static final void gtk_file_chooser_set_current_name(long chooser, byte[] name) { lock.lock(); try { _gtk_file_chooser_set_current_name(chooser, name); @@ -2405,8 +2405,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param local_only cast=(gboolean) */ - public static final native void _gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only); - public static final void gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only) { + public static final native void _gtk_file_chooser_set_local_only(long chooser, boolean local_only); + public static final void gtk_file_chooser_set_local_only(long chooser, boolean local_only) { lock.lock(); try { _gtk_file_chooser_set_local_only(chooser, local_only); @@ -2418,8 +2418,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param do_overwrite_confirmation cast=(gboolean) */ - public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation); - public static final void gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation) { + public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(long chooser, boolean do_overwrite_confirmation); + public static final void gtk_file_chooser_set_do_overwrite_confirmation(long chooser, boolean do_overwrite_confirmation) { lock.lock(); try { _gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation); @@ -2431,8 +2431,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param extra_widget cast=(GtkWidget *) */ - public static final native void _gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget); - public static final void gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget) { + public static final native void _gtk_file_chooser_set_extra_widget(long chooser, long extra_widget); + public static final void gtk_file_chooser_set_extra_widget(long chooser, long extra_widget) { lock.lock(); try { _gtk_file_chooser_set_extra_widget(chooser, extra_widget); @@ -2444,8 +2444,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param name cast=(const gchar *) */ - public static final native void _gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name); - public static final void gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name) { + public static final native void _gtk_file_chooser_set_filename(long chooser, long name); + public static final void gtk_file_chooser_set_filename(long chooser, long name) { lock.lock(); try { _gtk_file_chooser_set_filename(chooser, name); @@ -2457,8 +2457,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param filter cast=(GtkFileFilter *) */ - public static final native void _gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter); - public static final void gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter) { + public static final native void _gtk_file_chooser_set_filter(long chooser, long filter); + public static final void gtk_file_chooser_set_filter(long chooser, long filter) { lock.lock(); try { _gtk_file_chooser_set_filter(chooser, filter); @@ -2470,8 +2470,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param uri cast=(const char *) */ - public static final native void _gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri); - public static final void gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri) { + public static final native void _gtk_file_chooser_set_uri(long chooser, byte [] uri); + public static final void gtk_file_chooser_set_uri(long chooser, byte [] uri) { lock.lock(); try { _gtk_file_chooser_set_uri(chooser, uri); @@ -2483,8 +2483,8 @@ public class GTK extends OS { * @param chooser cast=(GtkFileChooser *) * @param select_multiple cast=(gboolean) */ - public static final native void _gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple); - public static final void gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple) { + public static final native void _gtk_file_chooser_set_select_multiple(long chooser, boolean select_multiple); + public static final void gtk_file_chooser_set_select_multiple(long chooser, boolean select_multiple) { lock.lock(); try { _gtk_file_chooser_set_select_multiple(chooser, select_multiple); @@ -2492,9 +2492,9 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_gesture_multi_press_new(); + public static final native long _gtk_gesture_multi_press_new(); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_gesture_multi_press_new() { + public static final long gtk_gesture_multi_press_new() { lock.lock(); try { return _gtk_gesture_multi_press_new(); @@ -2502,9 +2502,9 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_event_controller_key_new(); + public static final native long _gtk_event_controller_key_new(); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_event_controller_key_new() { + public static final long gtk_event_controller_key_new() { lock.lock(); try { return _gtk_event_controller_key_new(); @@ -2512,9 +2512,9 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_event_controller_motion_new(); + public static final native long _gtk_event_controller_motion_new(); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_event_controller_motion_new() { + public static final long gtk_event_controller_motion_new() { lock.lock(); try { return _gtk_event_controller_motion_new(); @@ -2522,9 +2522,9 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_event_controller_scroll_new(int flag); + public static final native long _gtk_event_controller_scroll_new(int flag); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_event_controller_scroll_new(int flag) { + public static final long gtk_event_controller_scroll_new(int flag) { lock.lock(); try { return _gtk_event_controller_scroll_new(flag); @@ -2536,9 +2536,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param controller cast=(GtkEventController *) */ - public static final native void _gtk_widget_add_controller(long /*int*/ widget, long /*int*/ controller); + public static final native void _gtk_widget_add_controller(long widget, long controller); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_widget_add_controller(long /*int*/ widget, long /*int*/ controller) { + public static final void gtk_widget_add_controller(long widget, long controller) { lock.lock(); try { _gtk_widget_add_controller(widget, controller); @@ -2549,8 +2549,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase); - public static final void gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase) { + public static final native void _gtk_event_controller_set_propagation_phase(long controller, int phase); + public static final void gtk_event_controller_set_propagation_phase(long controller, int phase) { lock.lock(); try { _gtk_event_controller_set_propagation_phase(controller, phase); @@ -2565,8 +2565,8 @@ public class GTK extends OS { * @param accept_label cast=(const gchar *),flags=no_out * @param cancel_label cast=(const gchar *),flags=no_out */ - public static final native long /*int*/ _gtk_file_chooser_native_new(byte[] title, long /*int*/ parent, int action, byte[] accept_label, byte[] cancel_label); - public static final long /*int*/ gtk_file_chooser_native_new(byte[] title, long /*int*/ parent, int action, byte[] accept_label, byte[] cancel_label) { + public static final native long _gtk_file_chooser_native_new(byte[] title, long parent, int action, byte[] accept_label, byte[] cancel_label); + public static final long gtk_file_chooser_native_new(byte[] title, long parent, int action, byte[] accept_label, byte[] cancel_label) { lock.lock(); try { return _gtk_file_chooser_native_new(title, parent, action, accept_label, cancel_label); @@ -2577,8 +2577,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event); - public static final void gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event) { + public static final native void _gtk_event_controller_handle_event(long gesture, long event); + public static final void gtk_event_controller_handle_event(long gesture, long event) { lock.lock(); try { _gtk_event_controller_handle_event(gesture, event); @@ -2589,8 +2589,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_event_controller_get_widget(long /*int*/ controller); - public static final long /*int*/ gtk_event_controller_get_widget(long /*int*/ controller) { + public static final native long _gtk_event_controller_get_widget(long controller); + public static final long gtk_event_controller_get_widget(long controller) { lock.lock(); try { return _gtk_event_controller_get_widget(controller); @@ -2602,8 +2602,8 @@ public class GTK extends OS { * @param filter cast=(GtkFileFilter *) * @param pattern cast=(const gchar *) */ - public static final native void _gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern); - public static final void gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern) { + public static final native void _gtk_file_filter_add_pattern(long filter, byte[] pattern); + public static final void gtk_file_filter_add_pattern(long filter, byte[] pattern) { lock.lock(); try { _gtk_file_filter_add_pattern(filter, pattern); @@ -2611,8 +2611,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_file_filter_new(); - public static final long /*int*/ gtk_file_filter_new() { + public static final native long _gtk_file_filter_new(); + public static final long gtk_file_filter_new() { lock.lock(); try { return _gtk_file_filter_new(); @@ -2621,8 +2621,8 @@ public class GTK extends OS { } } /** @param filter cast=(GtkFileFilter *) */ - public static final native long /*int*/ _gtk_file_filter_get_name(long /*int*/ filter); - public static final long /*int*/ gtk_file_filter_get_name(long /*int*/ filter) { + public static final native long _gtk_file_filter_get_name(long filter); + public static final long gtk_file_filter_get_name(long filter) { lock.lock(); try { return _gtk_file_filter_get_name(filter); @@ -2634,8 +2634,8 @@ public class GTK extends OS { * @param filter cast=(GtkFileFilter *) * @param name cast=(const gchar *) */ - public static final native void _gtk_file_filter_set_name(long /*int*/ filter, byte[] name); - public static final void gtk_file_filter_set_name(long /*int*/ filter, byte[] name) { + public static final native void _gtk_file_filter_set_name(long filter, byte[] name); + public static final void gtk_file_filter_set_name(long filter, byte[] name) { lock.lock(); try { _gtk_file_filter_set_name(filter, name); @@ -2646,8 +2646,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native boolean _gtk_gesture_drag_get_start_point(long /*int*/ gesture, double[] x, double [] y); - public static final boolean gtk_gesture_drag_get_start_point(long /*int*/ gesture, double[] x, double [] y) { + public static final native boolean _gtk_gesture_drag_get_start_point(long gesture, double[] x, double [] y); + public static final boolean gtk_gesture_drag_get_start_point(long gesture, double[] x, double [] y) { lock.lock(); try { return _gtk_gesture_drag_get_start_point(gesture, x, y); @@ -2658,8 +2658,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native boolean _gtk_gesture_is_recognized(long /*int*/ gesture); - public static final boolean gtk_gesture_is_recognized(long /*int*/ gesture) { + public static final native boolean _gtk_gesture_is_recognized(long gesture); + public static final boolean gtk_gesture_is_recognized(long gesture) { lock.lock(); try { return _gtk_gesture_is_recognized(gesture); @@ -2671,8 +2671,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_gesture_drag_new(long /*int*/ widget); - public static final long /*int*/ gtk_gesture_drag_new(long /*int*/ widget) { + public static final native long _gtk_gesture_drag_new(long widget); + public static final long gtk_gesture_drag_new(long widget) { lock.lock(); try { return _gtk_gesture_drag_new(widget); @@ -2683,8 +2683,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_gesture_get_last_event(long /*int*/ gesture, long /*int*/ sequence); - public static final long /*int*/ gtk_gesture_get_last_event(long /*int*/ gesture, long /*int*/ sequence) { + public static final native long _gtk_gesture_get_last_event(long gesture, long sequence); + public static final long gtk_gesture_get_last_event(long gesture, long sequence) { lock.lock(); try { return _gtk_gesture_get_last_event(gesture,sequence); @@ -2695,8 +2695,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_gesture_get_last_updated_sequence(long /*int*/ gesture); - public static final long /*int*/ gtk_gesture_get_last_updated_sequence(long /*int*/ gesture) { + public static final native long _gtk_gesture_get_last_updated_sequence(long gesture); + public static final long gtk_gesture_get_last_updated_sequence(long gesture) { lock.lock(); try { return _gtk_gesture_get_last_updated_sequence(gesture); @@ -2707,8 +2707,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native boolean _gtk_gesture_get_point(long /*int*/ gesture, long /*int*/ sequence, double[] x, double [] y); - public static final boolean gtk_gesture_get_point(long /*int*/ gesture, long /*int*/ sequence, double[] x, double [] y) { + public static final native boolean _gtk_gesture_get_point(long gesture, long sequence, double[] x, double [] y); + public static final boolean gtk_gesture_get_point(long gesture, long sequence, double[] x, double [] y) { lock.lock(); try { return _gtk_gesture_get_point(gesture, sequence, x, y); @@ -2719,8 +2719,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_gesture_get_sequences(long /*int*/ gesture); - public static final long /*int*/ gtk_gesture_get_sequences(long /*int*/ gesture) { + public static final native long _gtk_gesture_get_sequences(long gesture); + public static final long gtk_gesture_get_sequences(long gesture) { lock.lock(); try { return _gtk_gesture_get_sequences(gesture); @@ -2731,8 +2731,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_gesture_group (long /*int*/ group_gesture, long /*int*/ gesture); - public static final void gtk_gesture_group (long /*int*/ group_gesture, long /*int*/ gesture) { + public static final native void _gtk_gesture_group (long group_gesture, long gesture); + public static final void gtk_gesture_group (long group_gesture, long gesture) { lock.lock(); try { _gtk_gesture_group(group_gesture, gesture); @@ -2743,8 +2743,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_gesture_pan_set_orientation(long /*int*/ orientation); - public static final void gtk_gesture_pan_set_orientation(long /*int*/ orientation) { + public static final native void _gtk_gesture_pan_set_orientation(long orientation); + public static final void gtk_gesture_pan_set_orientation(long orientation) { lock.lock(); try { _gtk_gesture_pan_set_orientation(orientation); @@ -2755,8 +2755,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_gesture_pan_get_orientation(long /*int*/ gesture); - public static final long /*int*/ gtk_gesture_pan_get_orientation(long /*int*/ gesture) { + public static final native long _gtk_gesture_pan_get_orientation(long gesture); + public static final long gtk_gesture_pan_get_orientation(long gesture) { lock.lock(); try { return _gtk_gesture_pan_get_orientation(gesture); @@ -2767,8 +2767,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_gesture_pan_new (long /*int*/ widget, long /*int*/ orientation); - public static final void gtk_gesture_pan_new (long /*int*/ widget, long /*int*/ orientation) { + public static final native void _gtk_gesture_pan_new (long widget, long orientation); + public static final void gtk_gesture_pan_new (long widget, long orientation) { lock.lock(); try { _gtk_gesture_pan_new(widget, orientation); @@ -2779,8 +2779,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_gesture_single_set_button(long /*int*/ gesture, int button); - public static final void gtk_gesture_single_set_button(long /*int*/ gesture, int button) { + public static final native void _gtk_gesture_single_set_button(long gesture, int button); + public static final void gtk_gesture_single_set_button(long gesture, int button) { lock.lock(); try { _gtk_gesture_single_set_button(gesture, button); @@ -2791,8 +2791,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native boolean _gtk_gesture_swipe_get_velocity(long /*int*/ gesture, double [] velocity_x, double[] velocity_y); - public static final boolean gtk_gesture_swipe_get_velocity(long /*int*/ gesture, double [] velocity_x, double[] velocity_y) { + public static final native boolean _gtk_gesture_swipe_get_velocity(long gesture, double [] velocity_x, double[] velocity_y); + public static final boolean gtk_gesture_swipe_get_velocity(long gesture, double [] velocity_x, double[] velocity_y) { lock.lock(); try { return _gtk_gesture_swipe_get_velocity(gesture, velocity_x, velocity_y); @@ -2803,8 +2803,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_gesture_swipe_new (long /*int*/ widget); - public static final long /*int*/ gtk_gesture_swipe_new (long /*int*/ widget) { + public static final native long _gtk_gesture_swipe_new (long widget); + public static final long gtk_gesture_swipe_new (long widget) { lock.lock(); try { return _gtk_gesture_swipe_new(widget); @@ -2815,8 +2815,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y); - public static final void gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y) { + public static final native void _gtk_gesture_drag_get_offset(long gesture, double[] x, double[] y); + public static final void gtk_gesture_drag_get_offset(long gesture, double[] x, double[] y) { lock.lock(); try { _gtk_gesture_drag_get_offset(gesture, x, y); @@ -2828,8 +2828,8 @@ public class GTK extends OS { * @method flags=dynamic */ - public static final native double _gtk_gesture_rotate_get_angle_delta (long /*int*/ gesture); - public static final double gtk_gesture_rotate_get_angle_delta (long /*int*/ gesture) { + public static final native double _gtk_gesture_rotate_get_angle_delta (long gesture); + public static final double gtk_gesture_rotate_get_angle_delta (long gesture) { lock.lock(); try { return _gtk_gesture_rotate_get_angle_delta(gesture); @@ -2841,8 +2841,8 @@ public class GTK extends OS { * @method flags=dynamic */ - public static final native long /*int*/ _gtk_gesture_rotate_new(long /*int*/ widget); - public static final long /*int*/ gtk_gesture_rotate_new(long /*int*/ widget) { + public static final native long _gtk_gesture_rotate_new(long widget); + public static final long gtk_gesture_rotate_new(long widget) { lock.lock(); try { return _gtk_gesture_rotate_new(widget); @@ -2853,8 +2853,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_gesture_zoom_new(long /*int*/ widget); - public static final long /*int*/ gtk_gesture_zoom_new(long /*int*/ widget) { + public static final native long _gtk_gesture_zoom_new(long widget); + public static final long gtk_gesture_zoom_new(long widget) { lock.lock(); try { return _gtk_gesture_zoom_new(widget); @@ -2865,8 +2865,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native double _gtk_gesture_zoom_get_scale_delta (long /*int*/ gesture); - public static final double gtk_gesture_zoom_get_scale_delta (long /*int*/ gesture) { + public static final native double _gtk_gesture_zoom_get_scale_delta (long gesture); + public static final double gtk_gesture_zoom_get_scale_delta (long gesture) { lock.lock(); try { return _gtk_gesture_zoom_get_scale_delta(gesture); @@ -2878,8 +2878,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_set_clip(long /*int*/ widget, GtkAllocation allocation); - public static final void gtk_widget_set_clip(long /*int*/ widget, GtkAllocation allocation) { + public static final native void _gtk_widget_set_clip(long widget, GtkAllocation allocation); + public static final void gtk_widget_set_clip(long widget, GtkAllocation allocation) { lock.lock(); try { _gtk_widget_set_clip(widget, allocation); @@ -2891,8 +2891,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_get_clip(long /*int*/ widget, GtkAllocation allocation); - public static final void gtk_widget_get_clip(long /*int*/ widget, GtkAllocation allocation) { + public static final native void _gtk_widget_get_clip(long widget, GtkAllocation allocation); + public static final void gtk_widget_get_clip(long widget, GtkAllocation allocation) { lock.lock(); try { _gtk_widget_get_clip(widget, allocation); @@ -2904,9 +2904,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param has_window cast=(gboolean) */ - public static final native void _gtk_widget_set_has_window(long /*int*/ widget, boolean has_window); + public static final native void _gtk_widget_set_has_window(long widget, boolean has_window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_widget_set_has_window(long /*int*/ widget, boolean has_window) { + public static final void gtk_widget_set_has_window(long widget, boolean has_window) { lock.lock(); try { _gtk_widget_set_has_window(widget, has_window); @@ -2918,9 +2918,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param has_surface cast=(gboolean) */ - public static final native void _gtk_widget_set_has_surface(long /*int*/ widget, boolean has_surface); + public static final native void _gtk_widget_set_has_surface(long widget, boolean has_surface); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_widget_set_has_surface(long /*int*/ widget, boolean has_surface) { + public static final void gtk_widget_set_has_surface(long widget, boolean has_surface) { lock.lock(); try { _gtk_widget_set_has_surface(widget, has_surface); @@ -2932,8 +2932,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param expand cast=(gboolean) */ - public static final native void _gtk_widget_set_hexpand(long /*int*/ widget, boolean expand); - public static final void gtk_widget_set_hexpand(long /*int*/ widget, boolean expand) { + public static final native void _gtk_widget_set_hexpand(long widget, boolean expand); + public static final void gtk_widget_set_hexpand(long widget, boolean expand) { lock.lock(); try { _gtk_widget_set_hexpand(widget, expand); @@ -2945,8 +2945,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param expand cast=(gboolean) */ - public static final native void _gtk_widget_set_vexpand(long /*int*/ widget, boolean expand); - public static final void gtk_widget_set_vexpand(long /*int*/ widget, boolean expand) { + public static final native void _gtk_widget_set_vexpand(long widget, boolean expand); + public static final void gtk_widget_set_vexpand(long widget, boolean expand) { lock.lock(); try { _gtk_widget_set_vexpand(widget, expand); @@ -2961,8 +2961,8 @@ public class GTK extends OS { * @param xalign cast=(gfloat) * */ - public static final native void _gtk_label_set_xalign(long /*int*/ label, float xalign); - public static final void gtk_label_set_xalign(long /*int*/ label, float xalign) { + public static final native void _gtk_label_set_xalign(long label, float xalign); + public static final void gtk_label_set_xalign(long label, float xalign) { lock.lock(); try { _gtk_label_set_xalign(label, xalign); @@ -2977,8 +2977,8 @@ public class GTK extends OS { * @param yalign cast=(gfloat) * */ - public static final native void _gtk_label_set_yalign(long /*int*/ label, float yalign); - public static final void gtk_label_set_yalign(long /*int*/ label, float yalign) { + public static final native void _gtk_label_set_yalign(long label, float yalign); + public static final void gtk_label_set_yalign(long label, float yalign) { lock.lock(); try { _gtk_label_set_yalign(label, yalign); @@ -2990,8 +2990,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param gtk_align cast=(GtkAlign) */ - public static final native void _gtk_widget_set_halign(long /*int*/ widget, int gtk_align); - public static final void gtk_widget_set_halign(long /*int*/ widget, int gtk_align) { + public static final native void _gtk_widget_set_halign(long widget, int gtk_align); + public static final void gtk_widget_set_halign(long widget, int gtk_align) { lock.lock(); try { _gtk_widget_set_halign(widget, gtk_align); @@ -3003,8 +3003,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param gtk_align cast=(GtkAlign) */ - public static final native void _gtk_widget_set_valign(long /*int*/ widget, int gtk_align); - public static final void gtk_widget_set_valign(long /*int*/ widget, int gtk_align ) { + public static final native void _gtk_widget_set_valign(long widget, int gtk_align); + public static final void gtk_widget_set_valign(long widget, int gtk_align ) { lock.lock(); try { _gtk_widget_set_valign(widget, gtk_align); @@ -3017,8 +3017,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param margin cast=(gint) */ - public static final native void _gtk_widget_set_margin_start (long /*int*/ widget, int margin); - public static final void gtk_widget_set_margin_start (long /*int*/ widget, int margin) { + public static final native void _gtk_widget_set_margin_start (long widget, int margin); + public static final void gtk_widget_set_margin_start (long widget, int margin) { lock.lock(); try { _gtk_widget_set_margin_start(widget, margin); @@ -3031,8 +3031,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param margin cast=(gint) */ - public static final native void _gtk_widget_set_margin_end (long /*int*/ widget, int margin); - public static final void gtk_widget_set_margin_end (long /*int*/ widget, int margin) { + public static final native void _gtk_widget_set_margin_end (long widget, int margin); + public static final void gtk_widget_set_margin_end (long widget, int margin) { lock.lock(); try { _gtk_widget_set_margin_end(widget, margin); @@ -3045,8 +3045,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param margin cast=(gint) */ - public static final native void _gtk_widget_set_margin_top (long /*int*/ widget, int margin); - public static final void gtk_widget_set_margin_top (long /*int*/ widget, int margin) { + public static final native void _gtk_widget_set_margin_top (long widget, int margin); + public static final void gtk_widget_set_margin_top (long widget, int margin) { lock.lock(); try { _gtk_widget_set_margin_top(widget, margin); @@ -3059,8 +3059,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param margin cast=(gint) */ - public static final native void _gtk_widget_set_margin_bottom (long /*int*/ widget, int margin); - public static final void gtk_widget_set_margin_bottom (long /*int*/ widget, int margin) { + public static final native void _gtk_widget_set_margin_bottom (long widget, int margin); + public static final void gtk_widget_set_margin_bottom (long widget, int margin) { lock.lock(); try { _gtk_widget_set_margin_bottom(widget, margin); @@ -3072,8 +3072,8 @@ public class GTK extends OS { * @param title cast=(const gchar *) * @param parent cast=(GtkWindow *) */ - public static final native long /*int*/ _gtk_font_chooser_dialog_new(byte[] title, long /*int*/ parent); - public static final long /*int*/ gtk_font_chooser_dialog_new(byte[] title, long /*int*/ parent) { + public static final native long _gtk_font_chooser_dialog_new(byte[] title, long parent); + public static final long gtk_font_chooser_dialog_new(byte[] title, long parent) { lock.lock(); try { return _gtk_font_chooser_dialog_new(title, parent); @@ -3084,8 +3084,8 @@ public class GTK extends OS { /** * @param fontchooser cast=(GtkFontChooser *) */ - public static final native long /*int*/ _gtk_font_chooser_get_font(long /*int*/ fontchooser); - public static final long /*int*/ gtk_font_chooser_get_font(long /*int*/ fontchooser) { + public static final native long _gtk_font_chooser_get_font(long fontchooser); + public static final long gtk_font_chooser_get_font(long fontchooser) { lock.lock(); try { return _gtk_font_chooser_get_font(fontchooser); @@ -3097,8 +3097,8 @@ public class GTK extends OS { * @param fsd cast=(GtkFontChooser *) * @param fontname cast=(const gchar *) */ - public static final native void _gtk_font_chooser_set_font(long /*int*/ fsd, byte[] fontname); - public static final void gtk_font_chooser_set_font(long /*int*/ fsd, byte[] fontname) { + public static final native void _gtk_font_chooser_set_font(long fsd, byte[] fontname); + public static final void gtk_font_chooser_set_font(long fsd, byte[] fontname) { lock.lock(); try { _gtk_font_chooser_set_font(fsd, fontname); @@ -3107,8 +3107,8 @@ public class GTK extends OS { } } /** @param label cast=(const gchar *) */ - public static final native long /*int*/ _gtk_frame_new(byte[] label); - public static final long /*int*/ gtk_frame_new(byte[] label) { + public static final native long _gtk_frame_new(byte[] label); + public static final long gtk_frame_new(byte[] label) { lock.lock(); try { return _gtk_frame_new(label); @@ -3117,8 +3117,8 @@ public class GTK extends OS { } } /** @param frame cast=(GtkFrame *) */ - public static final native long /*int*/ _gtk_frame_get_label_widget(long /*int*/ frame); - public static final long /*int*/ gtk_frame_get_label_widget(long /*int*/ frame) { + public static final native long _gtk_frame_get_label_widget(long frame); + public static final long gtk_frame_get_label_widget(long frame) { lock.lock(); try { return _gtk_frame_get_label_widget(frame); @@ -3130,8 +3130,8 @@ public class GTK extends OS { * @param frame cast=(GtkFrame *) * @param label_widget cast=(GtkWidget *) */ - public static final native void _gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget); - public static final void gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget) { + public static final native void _gtk_frame_set_label_widget(long frame, long label_widget); + public static final void gtk_frame_set_label_widget(long frame, long label_widget) { lock.lock(); try { _gtk_frame_set_label_widget(frame, label_widget); @@ -3143,8 +3143,8 @@ public class GTK extends OS { * @param frame cast=(GtkFrame *) * @param type cast=(GtkShadowType) */ - public static final native void _gtk_frame_set_shadow_type(long /*int*/ frame, int type); - public static final void gtk_frame_set_shadow_type(long /*int*/ frame, int type) { + public static final native void _gtk_frame_set_shadow_type(long frame, int type); + public static final void gtk_frame_set_shadow_type(long frame, int type) { lock.lock(); try { _gtk_frame_set_shadow_type(frame, type); @@ -3152,8 +3152,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_get_current_event(); - public static final long /*int*/ gtk_get_current_event() { + public static final native long _gtk_get_current_event(); + public static final long gtk_get_current_event() { lock.lock(); try { return _gtk_get_current_event(); @@ -3171,8 +3171,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_get_default_language(); - public static final long /*int*/ gtk_get_default_language() { + public static final native long _gtk_get_default_language(); + public static final long gtk_get_default_language() { lock.lock(); try { return _gtk_get_default_language(); @@ -3181,8 +3181,8 @@ public class GTK extends OS { } } /** @param event cast=(GdkEvent *) */ - public static final native long /*int*/ _gtk_get_event_widget(long /*int*/ event); - public static final long /*int*/ gtk_get_event_widget(long /*int*/ event) { + public static final native long _gtk_get_event_widget(long event); + public static final long gtk_get_event_widget(long event) { lock.lock(); try { return _gtk_get_event_widget(event); @@ -3191,8 +3191,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_grab_add(long /*int*/ widget); - public static final void gtk_grab_add(long /*int*/ widget) { + public static final native void _gtk_grab_add(long widget); + public static final void gtk_grab_add(long widget) { lock.lock(); try { _gtk_grab_add(widget); @@ -3200,8 +3200,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_grab_get_current(); - public static final long /*int*/ gtk_grab_get_current() { + public static final native long _gtk_grab_get_current(); + public static final long gtk_grab_get_current() { lock.lock(); try { return _gtk_grab_get_current(); @@ -3210,8 +3210,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_grab_remove(long /*int*/ widget); - public static final void gtk_grab_remove(long /*int*/ widget) { + public static final native void _gtk_grab_remove(long widget); + public static final void gtk_grab_remove(long widget) { lock.lock(); try { _gtk_grab_remove(widget); @@ -3257,8 +3257,8 @@ public class GTK extends OS { * @param orientation cast=(GtkOrientation) * @param spacing cast=(gint) */ - public static final native long /*int*/ _gtk_box_new(int orientation, int spacing); - public static final long /*int*/ gtk_box_new(int orientation, int spacing) { + public static final native long _gtk_box_new(int orientation, int spacing); + public static final long gtk_box_new(int orientation, int spacing) { lock.lock(); try { return _gtk_box_new(orientation, spacing); @@ -3274,10 +3274,10 @@ public class GTK extends OS { * @param fill cast=(gboolean) * @param padding cast=(guint) */ - public static final native void /*int*/ _gtk_box_pack_end(long /*int*/ box, long /*int*/ widget, + public static final native void _gtk_box_pack_end(long box, long widget, boolean expand, boolean fill, int padding); /** [GTK3 only] */ - public static final void /*int*/ gtk_box_pack_end(long /*int*/ box, long /*int*/ widget, + public static final void gtk_box_pack_end(long box, long widget, boolean expand, boolean fill, int padding) { lock.lock(); try { @@ -3291,9 +3291,9 @@ public class GTK extends OS { * @param box cast=(GtkBox *) * @param child cast=(GtkWidget *) */ - public static final native void /*int*/ _gtk_box_pack_end(long /*int*/ box, long /*int*/ child); + public static final native void _gtk_box_pack_end(long box, long child); /** [GTK4 only] */ - public static final void /*int*/ gtk_box_pack_end(long /*int*/ box, long /*int*/ child) { + public static final void gtk_box_pack_end(long box, long child) { lock.lock(); try { _gtk_box_pack_end(box, child); @@ -3306,8 +3306,8 @@ public class GTK extends OS { * @param child cast=(GtkWidget *) * @param position cast=(gint) */ - public static final native void /*int*/ _gtk_box_reorder_child(long /*int*/ box, long /*int*/ child, int position); - public static final void /*int*/ gtk_box_reorder_child(long /*int*/ box, long /*int*/ child, int position) { + public static final native void _gtk_box_reorder_child(long box, long child, int position); + public static final void gtk_box_reorder_child(long box, long child, int position) { lock.lock(); try { _gtk_box_reorder_child(box, child, position); @@ -3319,8 +3319,8 @@ public class GTK extends OS { * @param box cast=(GtkBox *) * @param homogeneous cast=(gboolean) */ - public static final native void _gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous); - public static final void gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous) { + public static final native void _gtk_box_set_homogeneous(long box, boolean homogeneous); + public static final void gtk_box_set_homogeneous(long box, boolean homogeneous) { lock.lock(); try { _gtk_box_set_homogeneous(box, homogeneous); @@ -3331,9 +3331,9 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native long /*int*/ _gtk_event_box_new(); + public static final native long _gtk_event_box_new(); /** [GTK3 only] */ - public static final long /*int*/ gtk_event_box_new() { + public static final long gtk_event_box_new() { lock.lock(); try { return _gtk_event_box_new(); @@ -3345,8 +3345,8 @@ public class GTK extends OS { * @param orientation cast=(GtkOrientation) * @param adjustment cast=(GtkAdjustment *) */ - public static final native long /*int*/ _gtk_scale_new(int orientation, long /*int*/ adjustment); - public static final long /*int*/ gtk_scale_new(int orientation, long /*int*/ adjustment) { + public static final native long _gtk_scale_new(int orientation, long adjustment); + public static final long gtk_scale_new(int orientation, long adjustment) { lock.lock(); try { return _gtk_scale_new(orientation, adjustment); @@ -3358,8 +3358,8 @@ public class GTK extends OS { * @param orientation cast=(GtkOrientation) * @param adjustment cast=(GtkAdjustment *) * */ - public static final native long /*int*/ _gtk_scrollbar_new(int orientation, long /*int*/ adjustment); - public static final long /*int*/ gtk_scrollbar_new(int orientation, long /*int*/ adjustment) { + public static final native long _gtk_scrollbar_new(int orientation, long adjustment); + public static final long gtk_scrollbar_new(int orientation, long adjustment) { lock.lock(); try { return _gtk_scrollbar_new(orientation, adjustment); @@ -3367,8 +3367,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_search_entry_new(); - public static final long /*int*/ gtk_search_entry_new() { + public static final native long _gtk_search_entry_new(); + public static final long gtk_search_entry_new() { lock.lock(); try { return _gtk_search_entry_new(); @@ -3379,8 +3379,8 @@ public class GTK extends OS { /** * @param orientation cast=(GtkOrientation) */ - public static final native long /*int*/ _gtk_separator_new(int orientation); - public static final long /*int*/ gtk_separator_new(int orientation) { + public static final native long _gtk_separator_new(int orientation); + public static final long gtk_separator_new(int orientation) { lock.lock(); try { return _gtk_separator_new(orientation); @@ -3390,8 +3390,8 @@ public class GTK extends OS { } // Get function pointer to gtk_status_icon_position_menu // See os_custom.h - public static final native long /*int*/ _gtk_status_icon_position_menu_func(); - public static final long /*int*/ gtk_status_icon_position_menu_func() { + public static final native long _gtk_status_icon_position_menu_func(); + public static final long gtk_status_icon_position_menu_func() { lock.lock(); try { return _gtk_status_icon_position_menu_func(); @@ -3400,8 +3400,8 @@ public class GTK extends OS { } } /** @return cast=(GtkIconTheme *) */ - public static final native long /*int*/ _gtk_icon_theme_get_default(); - public static final long /*int*/ gtk_icon_theme_get_default() { + public static final native long _gtk_icon_theme_get_default(); + public static final long gtk_icon_theme_get_default() { lock.lock(); try { return _gtk_icon_theme_get_default (); @@ -3415,8 +3415,8 @@ public class GTK extends OS { * @param size cast=(gint) * @param flags cast=(GtkIconLookupFlags) */ - public static final native long /*int*/ _gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags); - public static final long /*int*/ gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags) { + public static final native long _gtk_icon_theme_lookup_by_gicon(long icon_theme, long icon, int size, int flags); + public static final long gtk_icon_theme_lookup_by_gicon(long icon_theme, long icon, int size, int flags) { lock.lock(); try { return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags); @@ -3431,8 +3431,8 @@ public class GTK extends OS { * @param flags cast=(GtkIconLookupFlags) * @param error cast=(GError **) */ - public static final native long /*int*/ _gtk_icon_theme_load_icon(long /*int*/ icon_theme, byte[] icon_name, int size, int flags, long /*int*/ error); - public static final long /*int*/ gtk_icon_theme_load_icon(long /*int*/ icon_theme, byte[] icon_name, int size, int flags, long /*int*/ error) { + public static final native long _gtk_icon_theme_load_icon(long icon_theme, byte[] icon_name, int size, int flags, long error); + public static final long gtk_icon_theme_load_icon(long icon_theme, byte[] icon_name, int size, int flags, long error) { lock.lock(); try { return _gtk_icon_theme_load_icon (icon_theme, icon_name, size, flags, error); @@ -3444,8 +3444,8 @@ public class GTK extends OS { * @param icon_info cast=(GtkIconInfo *) * @param error cast=(GError **) */ - public static final native long /*int*/ _gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]); - public static final long /*int*/ gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]) { + public static final native long _gtk_icon_info_load_icon(long icon_info, long error[]); + public static final long gtk_icon_info_load_icon(long icon_info, long error[]) { lock.lock(); try { return _gtk_icon_info_load_icon(icon_info, error); @@ -3457,8 +3457,8 @@ public class GTK extends OS { * @param context cast=(GtkIMContext *) * @param event cast=(GdkEventKey *) */ - public static final native boolean _gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event); - public static final boolean gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event) { + public static final native boolean _gtk_im_context_filter_keypress(long context, long event); + public static final boolean gtk_im_context_filter_keypress(long context, long event) { lock.lock(); try { return _gtk_im_context_filter_keypress(context, event); @@ -3467,8 +3467,8 @@ public class GTK extends OS { } } /** @param context cast=(GtkIMContext *) */ - public static final native void _gtk_im_context_focus_in(long /*int*/ context); - public static final void gtk_im_context_focus_in(long /*int*/ context) { + public static final native void _gtk_im_context_focus_in(long context); + public static final void gtk_im_context_focus_in(long context) { lock.lock(); try { _gtk_im_context_focus_in(context); @@ -3477,8 +3477,8 @@ public class GTK extends OS { } } /** @param context cast=(GtkIMContext *) */ - public static final native void _gtk_im_context_focus_out(long /*int*/ context); - public static final void gtk_im_context_focus_out(long /*int*/ context) { + public static final native void _gtk_im_context_focus_out(long context); + public static final void gtk_im_context_focus_out(long context) { lock.lock(); try { _gtk_im_context_focus_out(context); @@ -3492,8 +3492,8 @@ public class GTK extends OS { * @param attrs cast=(PangoAttrList **) * @param cursor_pos cast=(gint *) */ - public static final native void _gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos); - public static final void gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) { + public static final native void _gtk_im_context_get_preedit_string(long context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos); + public static final void gtk_im_context_get_preedit_string(long context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) { lock.lock(); try { _gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos); @@ -3501,8 +3501,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_im_context_get_type(); - public static final long /*int*/ gtk_im_context_get_type() { + public static final native long _gtk_im_context_get_type(); + public static final long gtk_im_context_get_type() { lock.lock(); try { return _gtk_im_context_get_type(); @@ -3511,8 +3511,8 @@ public class GTK extends OS { } } /** @param context cast=(GtkIMContext *) */ - public static final native void _gtk_im_context_reset(long /*int*/ context); - public static final void gtk_im_context_reset(long /*int*/ context) { + public static final native void _gtk_im_context_reset(long context); + public static final void gtk_im_context_reset(long context) { lock.lock(); try { _gtk_im_context_reset(context); @@ -3524,8 +3524,8 @@ public class GTK extends OS { * @param context cast=(GtkIMContext *) * @param window cast=(GdkWindow *) */ - public static final native void _gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window); - public static final void gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window) { + public static final native void _gtk_im_context_set_client_window(long context, long window); + public static final void gtk_im_context_set_client_window(long context, long window) { lock.lock(); try { _gtk_im_context_set_client_window(context, window); @@ -3537,8 +3537,8 @@ public class GTK extends OS { * @param context cast=(GtkIMContext *) * @param area cast=(GdkRectangle *),flags=no_out */ - public static final native void _gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area); - public static final void gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area) { + public static final native void _gtk_im_context_set_cursor_location(long context, GdkRectangle area); + public static final void gtk_im_context_set_cursor_location(long context, GdkRectangle area) { lock.lock(); try { _gtk_im_context_set_cursor_location(context, area); @@ -3551,8 +3551,8 @@ public class GTK extends OS { * @param context cast=(GtkIMMulticontext *) * @param menushell cast=(GtkMenuShell *) */ - public static final native void _gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell); - public static final void gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell) { + public static final native void _gtk_im_multicontext_append_menuitems (long context, long menushell); + public static final void gtk_im_multicontext_append_menuitems (long context, long menushell) { lock.lock(); try { _gtk_im_multicontext_append_menuitems(context, menushell); @@ -3560,8 +3560,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_im_multicontext_new(); - public static final long /*int*/ gtk_im_multicontext_new() { + public static final native long _gtk_im_multicontext_new(); + public static final long gtk_im_multicontext_new() { lock.lock(); try { return _gtk_im_multicontext_new(); @@ -3569,8 +3569,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_image_new(); - public static final long /*int*/ gtk_image_new() { + public static final native long _gtk_image_new(); + public static final long gtk_image_new() { lock.lock(); try { return _gtk_image_new(); @@ -3582,8 +3582,8 @@ public class GTK extends OS { * @param image cast=(GtkImage *) * @param pixel_size cast=(gint) */ - public static final native void /*int*/ _gtk_image_set_pixel_size(long /*int*/ image, int pixel_size); - public static final void /*int*/ gtk_image_set_pixel_size(long /*int*/ image, int pixel_size) { + public static final native void _gtk_image_set_pixel_size(long image, int pixel_size); + public static final void gtk_image_set_pixel_size(long image, int pixel_size) { lock.lock(); try { _gtk_image_set_pixel_size(image, pixel_size); @@ -3592,8 +3592,8 @@ public class GTK extends OS { } } /** @param pixbuf cast=(GdkPixbuf *) */ - public static final native long /*int*/ _gtk_image_new_from_pixbuf(long /*int*/ pixbuf); - public static final long /*int*/ gtk_image_new_from_pixbuf(long /*int*/ pixbuf) { + public static final native long _gtk_image_new_from_pixbuf(long pixbuf); + public static final long gtk_image_new_from_pixbuf(long pixbuf) { lock.lock(); try { return _gtk_image_new_from_pixbuf(pixbuf); @@ -3605,8 +3605,8 @@ public class GTK extends OS { * @param image cast=(GtkImage *) * @param pixbuf cast=(GdkPixbuf *) */ - public static final native void _gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf); - public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf) { + public static final native void _gtk_image_set_from_pixbuf(long image, long pixbuf); + public static final void gtk_image_set_from_pixbuf(long image, long pixbuf) { lock.lock(); try { _gtk_image_set_from_pixbuf(image, pixbuf); @@ -3620,9 +3620,9 @@ public class GTK extends OS { * @param gicon cast=(GIcon *) * @param size cast=(GtkIconSize) */ - public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size); + public static final native void _gtk_image_set_from_gicon(long image, long gicon, int size); /** [GTK3 only] */ - public static final void gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size) { + public static final void gtk_image_set_from_gicon(long image, long gicon, int size) { lock.lock(); try { _gtk_image_set_from_gicon(image, gicon, size); @@ -3635,9 +3635,9 @@ public class GTK extends OS { * @param image cast=(GtkImage *) * @param gicon cast=(GIcon *) */ - public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon); + public static final native void _gtk_image_set_from_gicon(long image, long gicon); /** [GTK4 only] */ - public static final void gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon) { + public static final void gtk_image_set_from_gicon(long image, long gicon) { lock.lock(); try { _gtk_image_set_from_gicon(image, gicon); @@ -3650,9 +3650,9 @@ public class GTK extends OS { * @param icon_name cast=(const gchar *) * @param size cast=(GtkIconSize) */ - public static final native long /*int*/ _gtk_image_new_from_icon_name (byte[] icon_name, int size); + public static final native long _gtk_image_new_from_icon_name (byte[] icon_name, int size); /** [GTK3 only] */ - public static final long /*int*/ gtk_image_new_from_icon_name (byte[] icon_name, int size) { + public static final long gtk_image_new_from_icon_name (byte[] icon_name, int size) { lock.lock(); try { return _gtk_image_new_from_icon_name (icon_name, size); @@ -3664,9 +3664,9 @@ public class GTK extends OS { * @method flags=dynamic * @param icon_name cast=(const gchar *) */ - public static final native long /*int*/ _gtk_image_new_from_icon_name (byte[] icon_name); + public static final native long _gtk_image_new_from_icon_name (byte[] icon_name); /** [GTK4 only] */ - public static final long /*int*/ gtk_image_new_from_icon_name (byte[] icon_name) { + public static final long gtk_image_new_from_icon_name (byte[] icon_name) { lock.lock(); try { return _gtk_image_new_from_icon_name (icon_name); @@ -3680,9 +3680,9 @@ public class GTK extends OS { * @param icon_name cast=(const gchar *) * @param size cast=(GtkIconSize) */ - public static final native void _gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name, int size); + public static final native void _gtk_image_set_from_icon_name (long image, byte[] icon_name, int size); /** [GTK3 only] */ - public static final void gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name, int size) { + public static final void gtk_image_set_from_icon_name (long image, byte[] icon_name, int size) { lock.lock(); try { _gtk_image_set_from_icon_name (image, icon_name, size); @@ -3695,9 +3695,9 @@ public class GTK extends OS { * @param image cast=(GtkImage *) * @param icon_name cast=(const gchar *) */ - public static final native void _gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name); + public static final native void _gtk_image_set_from_icon_name (long image, byte[] icon_name); /** [GTK4 only] */ - public static final void gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name) { + public static final void gtk_image_set_from_icon_name (long image, byte[] icon_name) { lock.lock(); try { _gtk_image_set_from_icon_name (image, icon_name); @@ -3734,8 +3734,8 @@ public class GTK extends OS { } } /** @param label cast=(GtkLabel *) */ - public static final native long /*int*/ _gtk_label_get_layout(long /*int*/ label); - public static final long /*int*/ gtk_label_get_layout(long /*int*/ label) { + public static final native long _gtk_label_get_layout(long label); + public static final long gtk_label_get_layout(long label) { lock.lock(); try { return _gtk_label_get_layout(label); @@ -3744,8 +3744,8 @@ public class GTK extends OS { } } /** @param label cast=(GtkLabel *) */ - public static final native int _gtk_label_get_mnemonic_keyval(long /*int*/ label); - public static final int gtk_label_get_mnemonic_keyval(long /*int*/ label) { + public static final native int _gtk_label_get_mnemonic_keyval(long label); + public static final int gtk_label_get_mnemonic_keyval(long label) { lock.lock(); try { return _gtk_label_get_mnemonic_keyval(label); @@ -3754,8 +3754,8 @@ public class GTK extends OS { } } /** @param label cast=(const gchar *) */ - public static final native long /*int*/ _gtk_label_new(byte[] label); - public static final long /*int*/ gtk_label_new(byte[] label) { + public static final native long _gtk_label_new(byte[] label); + public static final long gtk_label_new(byte[] label) { lock.lock(); try { return _gtk_label_new(label); @@ -3764,8 +3764,8 @@ public class GTK extends OS { } } /** @param str cast=(const gchar *) */ - public static final native long /*int*/ _gtk_label_new_with_mnemonic(byte[] str); - public static final long /*int*/ gtk_label_new_with_mnemonic(byte[] str) { + public static final native long _gtk_label_new_with_mnemonic(byte[] str); + public static final long gtk_label_new_with_mnemonic(byte[] str) { lock.lock(); try { return _gtk_label_new_with_mnemonic(str); @@ -3777,8 +3777,8 @@ public class GTK extends OS { * @param label cast=(GtkLabel *) * @param attrs cast=(PangoAttrList *) */ - public static final native void _gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs); - public static final void gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs) { + public static final native void _gtk_label_set_attributes(long label, long attrs); + public static final void gtk_label_set_attributes(long label, long attrs) { lock.lock(); try { _gtk_label_set_attributes(label, attrs); @@ -3790,8 +3790,8 @@ public class GTK extends OS { * @param label cast=(GtkLabel *) * @param jtype cast=(GtkJustification) */ - public static final native void _gtk_label_set_justify(long /*int*/ label, int jtype); - public static final void gtk_label_set_justify(long /*int*/ label, int jtype) { + public static final native void _gtk_label_set_justify(long label, int jtype); + public static final void gtk_label_set_justify(long label, int jtype) { lock.lock(); try { _gtk_label_set_justify(label, jtype); @@ -3803,8 +3803,8 @@ public class GTK extends OS { * @param label cast=(GtkLabel *) * @param wrap cast=(gboolean) */ - public static final native void _gtk_label_set_line_wrap(long /*int*/ label, boolean wrap); - public static final void gtk_label_set_line_wrap(long /*int*/ label, boolean wrap) { + public static final native void _gtk_label_set_line_wrap(long label, boolean wrap); + public static final void gtk_label_set_line_wrap(long label, boolean wrap) { lock.lock(); try { _gtk_label_set_line_wrap(label, wrap); @@ -3816,8 +3816,8 @@ public class GTK extends OS { * @param label cast=(GtkLabel *) * @param wrap_mode cast=(PangoWrapMode) */ - public static final native void _gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode); - public static final void gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode) { + public static final native void _gtk_label_set_line_wrap_mode(long label, int wrap_mode); + public static final void gtk_label_set_line_wrap_mode(long label, int wrap_mode) { lock.lock(); try { _gtk_label_set_line_wrap_mode(label, wrap_mode); @@ -3829,8 +3829,8 @@ public class GTK extends OS { * @param label cast=(GtkLabel *) * @param str cast=(const gchar *) */ - public static final native void _gtk_label_set_text(long /*int*/ label, long /*int*/ str); - public static final void gtk_label_set_text(long /*int*/ label, long /*int*/ str) { + public static final native void _gtk_label_set_text(long label, long str); + public static final void gtk_label_set_text(long label, long str) { lock.lock(); try { _gtk_label_set_text(label, str); @@ -3842,8 +3842,8 @@ public class GTK extends OS { * @param label cast=(GtkLabel *) * @param str cast=(const gchar *) */ - public static final native void _gtk_label_set_text(long /*int*/ label, byte[] str); - public static final void gtk_label_set_text(long /*int*/ label, byte[] str) { + public static final native void _gtk_label_set_text(long label, byte[] str); + public static final void gtk_label_set_text(long label, byte[] str) { lock.lock(); try { _gtk_label_set_text(label, str); @@ -3855,8 +3855,8 @@ public class GTK extends OS { * @param label cast=(GtkLabel *) * @param str cast=(const gchar *) */ - public static final native void _gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str); - public static final void gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str) { + public static final native void _gtk_label_set_text_with_mnemonic(long label, byte[] str); + public static final void gtk_label_set_text_with_mnemonic(long label, byte[] str) { lock.lock(); try { _gtk_label_set_text_with_mnemonic(label, str); @@ -3868,8 +3868,8 @@ public class GTK extends OS { * @param list_store cast=(GtkListStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter); - public static final void gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter) { + public static final native void _gtk_list_store_append(long list_store, long iter); + public static final void gtk_list_store_append(long list_store, long iter) { lock.lock(); try { _gtk_list_store_append(list_store, iter); @@ -3878,8 +3878,8 @@ public class GTK extends OS { } } /** @param store cast=(GtkListStore *) */ - public static final native void _gtk_list_store_clear(long /*int*/ store); - public static final void gtk_list_store_clear(long /*int*/ store) { + public static final native void _gtk_list_store_clear(long store); + public static final void gtk_list_store_clear(long store) { lock.lock(); try { _gtk_list_store_clear(store); @@ -3892,8 +3892,8 @@ public class GTK extends OS { * @param iter cast=(GtkTreeIter *) * @param position cast=(gint) */ - public static final native void _gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position); - public static final void gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position) { + public static final native void _gtk_list_store_insert(long list_store, long iter, int position); + public static final void gtk_list_store_insert(long list_store, long iter, int position) { lock.lock(); try { _gtk_list_store_insert(list_store, iter, position); @@ -3905,8 +3905,8 @@ public class GTK extends OS { * @param numColumns cast=(gint) * @param types cast=(GType *) */ - public static final native long /*int*/ _gtk_list_store_newv(int numColumns, long /*int*/[] types); - public static final long /*int*/ gtk_list_store_newv(int numColumns, long /*int*/[] types) { + public static final native long _gtk_list_store_newv(int numColumns, long /*int*/[] types); + public static final long gtk_list_store_newv(int numColumns, long /*int*/[] types) { lock.lock(); try { return _gtk_list_store_newv(numColumns, types); @@ -3920,9 +3920,9 @@ public class GTK extends OS { * @param length cast=(gssize) * @param error cast=(GError **) */ - public static final native boolean _gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length, long /*int*/ error[]); + public static final native boolean _gtk_css_provider_load_from_data(long css_provider, byte[] data, long length, long error[]); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length, long /*int*/ error[] ) { + public static final boolean gtk_css_provider_load_from_data(long css_provider, byte[] data, long length, long error[] ) { lock.lock(); try { return _gtk_css_provider_load_from_data(css_provider, data, length, error); @@ -3935,9 +3935,9 @@ public class GTK extends OS { * @param data cast=(const gchar *) * @param length cast=(gssize) */ - public static final native void _gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length); + public static final native void _gtk_css_provider_load_from_data(long css_provider, byte[] data, long length); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length) { + public static final void gtk_css_provider_load_from_data(long css_provider, byte[] data, long length) { lock.lock(); try { _gtk_css_provider_load_from_data(css_provider, data, length); @@ -3945,7 +3945,7 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_css_provider_new(); + public static final native long _gtk_css_provider_new(); public static final long /*int*/gtk_css_provider_new() { lock.lock(); try { @@ -3957,8 +3957,8 @@ public class GTK extends OS { /** * @param provider cast=(GtkCssProvider *) */ - public static final native long /*int*/ _gtk_css_provider_to_string(long /*int*/ provider); - public static final long /*int*/ gtk_css_provider_to_string(long /*int*/ provider) { + public static final native long _gtk_css_provider_to_string(long provider); + public static final long gtk_css_provider_to_string(long provider) { lock.lock(); try { return _gtk_css_provider_to_string(provider); @@ -3970,8 +3970,8 @@ public class GTK extends OS { * @param name cast=(const gchar *) * @param variant cast=(const gchar *) */ - public static final native long /*int*/ _gtk_css_provider_get_named (byte[] name, byte[] variant); - public static final long /*int*/ gtk_css_provider_get_named(byte[] name, byte[] variant) { + public static final native long _gtk_css_provider_get_named (byte[] name, byte[] variant); + public static final long gtk_css_provider_get_named(byte[] name, byte[] variant) { lock.lock(); try { return _gtk_css_provider_get_named(name, variant); @@ -3984,9 +3984,9 @@ public class GTK extends OS { * @param provider cast=(GtkStyleProvider *) * @param priority cast=(guint) */ - public static final native void _gtk_style_context_add_provider_for_screen (long /*int*/ screen, long /*int*/ provider, int priority); + public static final native void _gtk_style_context_add_provider_for_screen (long screen, long provider, int priority); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_style_context_add_provider_for_screen(long /*int*/ screen, long /*int*/ provider, int priority) { + public static final void gtk_style_context_add_provider_for_screen(long screen, long provider, int priority) { lock.lock(); try { _gtk_style_context_add_provider_for_screen(screen, provider, priority); @@ -4000,9 +4000,9 @@ public class GTK extends OS { * @param provider cast=(GtkStyleProvider *) * @param priority cast=(guint) */ - public static final native void _gtk_style_context_add_provider_for_display (long /*int*/ display, long /*int*/ provider, int priority); + public static final native void _gtk_style_context_add_provider_for_display (long display, long provider, int priority); /** [GTK4 only] */ - public static final void gtk_style_context_add_provider_for_display(long /*int*/ display, long /*int*/ provider, int priority) { + public static final void gtk_style_context_add_provider_for_display(long display, long provider, int priority) { lock.lock(); try { _gtk_style_context_add_provider_for_display(display, provider, priority); @@ -4015,7 +4015,7 @@ public class GTK extends OS { * @param provider cast=(GtkStyleProvider *) * @param priority cast=(guint) */ - public static final native void _gtk_style_context_add_provider (long /*int*/ context, long /*int*/ provider, int priority); + public static final native void _gtk_style_context_add_provider (long context, long provider, int priority); public static final void gtk_style_context_add_provider( long /*int*/context, long /*int*/provider, int priority) { lock.lock(); @@ -4029,8 +4029,8 @@ public class GTK extends OS { * @param list_store cast=(GtkListStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter); - public static final void gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter) { + public static final native void _gtk_list_store_remove(long list_store, long iter); + public static final void gtk_list_store_remove(long list_store, long iter) { lock.lock(); try { _gtk_list_store_remove(list_store, iter); @@ -4042,8 +4042,8 @@ public class GTK extends OS { * @param store cast=(GtkListStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator); - public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) { + public static final native void _gtk_list_store_set(long store, long iter, int column, byte[] value, int terminator); + public static final void gtk_list_store_set(long store, long iter, int column, byte[] value, int terminator) { lock.lock(); try { _gtk_list_store_set(store, iter, column, value, terminator); @@ -4055,8 +4055,8 @@ public class GTK extends OS { * @param store cast=(GtkListStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator); - public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) { + public static final native void _gtk_list_store_set(long store, long iter, int column, int value, int terminator); + public static final void gtk_list_store_set(long store, long iter, int column, int value, int terminator) { lock.lock(); try { _gtk_list_store_set(store, iter, column, value, terminator); @@ -4068,8 +4068,8 @@ public class GTK extends OS { * @param store cast=(GtkListStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator); - public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) { + public static final native void _gtk_list_store_set(long store, long iter, int column, long value, int terminator); + public static final void gtk_list_store_set(long store, long iter, int column, long value, int terminator) { lock.lock(); try { _gtk_list_store_set(store, iter, column, value, terminator); @@ -4082,8 +4082,8 @@ public class GTK extends OS { * @param iter cast=(GtkTreeIter *) * @param value flags=no_out */ - public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator); - public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator) { + public static final native void _gtk_list_store_set(long store, long iter, int column, GdkRGBA value, int terminator); + public static final void gtk_list_store_set(long store, long iter, int column, GdkRGBA value, int terminator) { lock.lock(); try { _gtk_list_store_set(store, iter, column, value, terminator); @@ -4095,8 +4095,8 @@ public class GTK extends OS { * @param store cast=(GtkListStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator); - public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) { + public static final native void _gtk_list_store_set(long store, long iter, int column, boolean value, int terminator); + public static final void gtk_list_store_set(long store, long iter, int column, boolean value, int terminator) { lock.lock(); try { _gtk_list_store_set(store, iter, column, value, terminator); @@ -4141,8 +4141,8 @@ public class GTK extends OS { } } /** @param event cast=(GdkEvent *) */ - public static final native void _gtk_main_do_event(long /*int*/ event); - public static final void gtk_main_do_event(long /*int*/ event) { + public static final native void _gtk_main_do_event(long event); + public static final void gtk_main_do_event(long event) { lock.lock(); try { _gtk_main_do_event(event); @@ -4150,8 +4150,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_menu_bar_new(); - public static final long /*int*/ gtk_menu_bar_new() { + public static final native long _gtk_menu_bar_new(); + public static final long gtk_menu_bar_new() { lock.lock(); try { return _gtk_menu_bar_new(); @@ -4160,8 +4160,8 @@ public class GTK extends OS { } } /** @param menu_item cast=(GtkMenuItem *) */ - public static final native long /*int*/ _gtk_menu_item_get_submenu(long /*int*/ menu_item); - public static final long /*int*/ gtk_menu_item_get_submenu(long /*int*/ menu_item) { + public static final native long _gtk_menu_item_get_submenu(long menu_item); + public static final long gtk_menu_item_get_submenu(long menu_item) { lock.lock(); try { return _gtk_menu_item_get_submenu(menu_item); @@ -4169,8 +4169,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_menu_item_new(); - public static final long /*int*/ gtk_menu_item_new() { + public static final native long _gtk_menu_item_new(); + public static final long gtk_menu_item_new() { lock.lock(); try { return _gtk_menu_item_new(); @@ -4182,8 +4182,8 @@ public class GTK extends OS { * @param menu_item cast=(GtkMenuItem *) * @param submenu cast=(GtkWidget *) */ - public static final native void _gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu); - public static final void gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu) { + public static final native void _gtk_menu_item_set_submenu(long menu_item, long submenu); + public static final void gtk_menu_item_set_submenu(long menu_item, long submenu) { lock.lock(); try { _gtk_menu_item_set_submenu(menu_item, submenu); @@ -4191,8 +4191,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_menu_new(); - public static final long /*int*/ gtk_menu_new() { + public static final native long _gtk_menu_new(); + public static final long gtk_menu_new() { lock.lock(); try { return _gtk_menu_new(); @@ -4201,8 +4201,8 @@ public class GTK extends OS { } } /** @param menu cast=(GtkMenu *) */ - public static final native void _gtk_menu_popdown(long /*int*/ menu); - public static final void gtk_menu_popdown(long /*int*/ menu) { + public static final native void _gtk_menu_popdown(long menu); + public static final void gtk_menu_popdown(long menu) { lock.lock(); try { _gtk_menu_popdown(menu); @@ -4220,9 +4220,9 @@ public class GTK extends OS { * @param button cast=(guint) * @param activate_time cast=(guint32) */ - public static final native void _gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time); + public static final native void _gtk_menu_popup(long menu, long parent_menu_shell, long parent_menu_item, long func, long data, int button, int activate_time); /** [GTK2/GTK3; 3.22 deprecated, replaced] */ - public static final void gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time) { + public static final void gtk_menu_popup(long menu, long parent_menu_shell, long parent_menu_item, long func, long data, int button, int activate_time) { lock.lock(); try { _gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time); @@ -4233,8 +4233,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_menu_popup_at_pointer(long /*int*/ menu, long /*int*/ trigger_event); - public static void gtk_menu_popup_at_pointer(long /*int*/ menu, long /*int*/ trigger_event) { + public static final native void _gtk_menu_popup_at_pointer(long menu, long trigger_event); + public static void gtk_menu_popup_at_pointer(long menu, long trigger_event) { lock.lock(); try { _gtk_menu_popup_at_pointer(menu, trigger_event); @@ -4245,8 +4245,8 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_menu_popup_at_rect(long /*int*/ menu, long /*int*/ rect_window, GdkRectangle rect, int rect_anchor, int menu_anchor, long /*int*/ trigger_event); - public static void gtk_menu_popup_at_rect(long /*int*/ menu, long /*int*/ rect_window, GdkRectangle rect, int rect_anchor, int menu_anchor, long /*int*/ trigger_event) { + public static final native void _gtk_menu_popup_at_rect(long menu, long rect_window, GdkRectangle rect, int rect_anchor, int menu_anchor, long trigger_event); + public static void gtk_menu_popup_at_rect(long menu, long rect_window, GdkRectangle rect, int rect_anchor, int menu_anchor, long trigger_event) { lock.lock(); try { _gtk_menu_popup_at_rect(menu, rect_window, rect, rect_anchor, menu_anchor, trigger_event); @@ -4255,8 +4255,8 @@ public class GTK extends OS { } } /** @param menu_shell cast=(GtkMenuShell *) */ - public static final native void _gtk_menu_shell_deactivate(long /*int*/ menu_shell); - public static final void gtk_menu_shell_deactivate(long /*int*/ menu_shell) { + public static final native void _gtk_menu_shell_deactivate(long menu_shell); + public static final void gtk_menu_shell_deactivate(long menu_shell) { lock.lock(); try { _gtk_menu_shell_deactivate(menu_shell); @@ -4269,8 +4269,8 @@ public class GTK extends OS { * @param child cast=(GtkWidget *) * @param position cast=(gint) */ - public static final native void _gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position); - public static final void gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position) { + public static final native void _gtk_menu_shell_insert(long menu_shell, long child, int position); + public static final void gtk_menu_shell_insert(long menu_shell, long child, int position) { lock.lock(); try { _gtk_menu_shell_insert(menu_shell, child, position); @@ -4282,8 +4282,8 @@ public class GTK extends OS { * @param menu_shell cast=(GtkMenuShell *) * @param take_focus cast=(gboolean) */ - public static final native void _gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus); - public static final void gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus) { + public static final native void _gtk_menu_shell_set_take_focus(long menu_shell, boolean take_focus); + public static final void gtk_menu_shell_set_take_focus(long menu_shell, boolean take_focus) { lock.lock(); try { _gtk_menu_shell_set_take_focus(menu_shell, take_focus); @@ -4295,8 +4295,8 @@ public class GTK extends OS { * @param icon_widget cast=(GtkWidget *) * @param label cast=(const gchar *) */ - public static final native long /*int*/ _gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label); - public static final long /*int*/ gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label) { + public static final native long _gtk_menu_tool_button_new(long icon_widget, byte[] label); + public static final long gtk_menu_tool_button_new(long icon_widget, byte[] label) { lock.lock(); try { return _gtk_menu_tool_button_new(icon_widget, label); @@ -4312,8 +4312,8 @@ public class GTK extends OS { * @param message_format cast=(const gchar *) * @param arg cast=(const gchar *) */ - public static final native long /*int*/ _gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format, byte[] arg); - public static final long /*int*/ gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format, byte[] arg) { + public static final native long _gtk_message_dialog_new(long parent, int flags, int type, int buttons, byte[] message_format, byte[] arg); + public static final long gtk_message_dialog_new(long parent, int flags, int type, int buttons, byte[] message_format, byte[] arg) { lock.lock(); try { return _gtk_message_dialog_new(parent, flags, type, buttons, message_format, arg); @@ -4327,9 +4327,9 @@ public class GTK extends OS { * @param xalign cast=(gfloat) * @param yalign cast=(gfloat) */ - public static final native void _gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign); + public static final native void _gtk_misc_set_alignment(long misc, float xalign, float yalign); /** [GTK3 only, if-def'd in os.h; 3.14 deprecated, replaced] */ - public static final void gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign) { + public static final void gtk_misc_set_alignment(long misc, float xalign, float yalign) { lock.lock(); try { _gtk_misc_set_alignment(misc, xalign, yalign); @@ -4338,8 +4338,8 @@ public class GTK extends OS { } } /** @param dialog cast=(GtkNativeDialog *) */ - public static final native int _gtk_native_dialog_run(long /*int*/ dialog); - public static final int gtk_native_dialog_run(long /*int*/ dialog) { + public static final native int _gtk_native_dialog_run(long dialog); + public static final int gtk_native_dialog_run(long dialog) { lock.lock(); try { return _gtk_native_dialog_run(dialog); @@ -4348,8 +4348,8 @@ public class GTK extends OS { } } /** @param notebook cast=(GtkNotebook *) */ - public static final native int _gtk_notebook_get_current_page(long /*int*/ notebook); - public static final int gtk_notebook_get_current_page(long /*int*/ notebook) { + public static final native int _gtk_notebook_get_current_page(long notebook); + public static final int gtk_notebook_get_current_page(long notebook) { lock.lock(); try { return _gtk_notebook_get_current_page(notebook); @@ -4358,8 +4358,8 @@ public class GTK extends OS { } } /** @param notebook cast=(GtkNotebook *) */ - public static final native boolean _gtk_notebook_get_scrollable(long /*int*/ notebook); - public static final boolean gtk_notebook_get_scrollable(long /*int*/ notebook) { + public static final native boolean _gtk_notebook_get_scrollable(long notebook); + public static final boolean gtk_notebook_get_scrollable(long notebook) { lock.lock(); try { return _gtk_notebook_get_scrollable(notebook); @@ -4373,8 +4373,8 @@ public class GTK extends OS { * @param tab_label cast=(GtkWidget *) * @param position cast=(gint) */ - public static final native void _gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position); - public static final void gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position) { + public static final native void _gtk_notebook_insert_page(long notebook, long child, long tab_label, int position); + public static final void gtk_notebook_insert_page(long notebook, long child, long tab_label, int position) { lock.lock(); try { _gtk_notebook_insert_page(notebook, child, tab_label, position); @@ -4382,8 +4382,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_notebook_new(); - public static final long /*int*/ gtk_notebook_new() { + public static final native long _gtk_notebook_new(); + public static final long gtk_notebook_new() { lock.lock(); try { return _gtk_notebook_new(); @@ -4392,8 +4392,8 @@ public class GTK extends OS { } } /** @param notebook cast=(GtkNotebook *) */ - public static final native void _gtk_notebook_next_page(long /*int*/ notebook); - public static final void gtk_notebook_next_page(long /*int*/ notebook) { + public static final native void _gtk_notebook_next_page(long notebook); + public static final void gtk_notebook_next_page(long notebook) { lock.lock(); try { _gtk_notebook_next_page(notebook); @@ -4402,8 +4402,8 @@ public class GTK extends OS { } } /** @param notebook cast=(GtkNotebook *) */ - public static final native void _gtk_notebook_prev_page(long /*int*/ notebook); - public static final void gtk_notebook_prev_page(long /*int*/ notebook) { + public static final native void _gtk_notebook_prev_page(long notebook); + public static final void gtk_notebook_prev_page(long notebook) { lock.lock(); try { _gtk_notebook_prev_page(notebook); @@ -4415,8 +4415,8 @@ public class GTK extends OS { * @param notebook cast=(GtkNotebook *) * @param page_num cast=(gint) */ - public static final native void _gtk_notebook_remove_page(long /*int*/ notebook, int page_num); - public static final void gtk_notebook_remove_page(long /*int*/ notebook, int page_num) { + public static final native void _gtk_notebook_remove_page(long notebook, int page_num); + public static final void gtk_notebook_remove_page(long notebook, int page_num) { lock.lock(); try { _gtk_notebook_remove_page(notebook, page_num); @@ -4428,8 +4428,8 @@ public class GTK extends OS { * @param notebook cast=(GtkNotebook *) * @param page_num cast=(gint) */ - public static final native void _gtk_notebook_set_current_page(long /*int*/ notebook, int page_num); - public static final void gtk_notebook_set_current_page(long /*int*/ notebook, int page_num) { + public static final native void _gtk_notebook_set_current_page(long notebook, int page_num); + public static final void gtk_notebook_set_current_page(long notebook, int page_num) { lock.lock(); try { _gtk_notebook_set_current_page(notebook, page_num); @@ -4441,8 +4441,8 @@ public class GTK extends OS { * @param notebook cast=(GtkNotebook *) * @param scrollable cast=(gboolean) */ - public static final native void _gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable); - public static final void gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable) { + public static final native void _gtk_notebook_set_scrollable(long notebook, boolean scrollable); + public static final void gtk_notebook_set_scrollable(long notebook, boolean scrollable) { lock.lock(); try { _gtk_notebook_set_scrollable(notebook, scrollable); @@ -4454,8 +4454,8 @@ public class GTK extends OS { * @param notebook cast=(GtkNotebook *) * @param show_tabs cast=(gboolean) */ - public static final native void _gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs); - public static final void gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs) { + public static final native void _gtk_notebook_set_show_tabs(long notebook, boolean show_tabs); + public static final void gtk_notebook_set_show_tabs(long notebook, boolean show_tabs) { lock.lock(); try { _gtk_notebook_set_show_tabs(notebook, show_tabs); @@ -4467,8 +4467,8 @@ public class GTK extends OS { * @param notebook cast=(GtkNotebook *) * @param pos cast=(GtkPositionType) */ - public static final native void _gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos); - public static final void gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos) { + public static final native void _gtk_notebook_set_tab_pos(long notebook, int pos); + public static final void gtk_notebook_set_tab_pos(long notebook, int pos) { lock.lock(); try { _gtk_notebook_set_tab_pos(notebook, pos); @@ -4480,8 +4480,8 @@ public class GTK extends OS { * @param orientable cast=(GtkOrientable *) * @param orientation cast=(GtkOrientation) */ - public static final native void _gtk_orientable_set_orientation(long /*int*/ orientable, int orientation); - public static final void gtk_orientable_set_orientation(long /*int*/ orientable, int orientation) { + public static final native void _gtk_orientable_set_orientation(long orientable, int orientation); + public static final void gtk_orientable_set_orientation(long orientable, int orientation) { lock.lock(); try { _gtk_orientable_set_orientation(orientable, orientation); @@ -4489,8 +4489,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_page_setup_new (); - public static final long /*int*/ gtk_page_setup_new () { + public static final native long _gtk_page_setup_new (); + public static final long gtk_page_setup_new () { lock.lock(); try { return _gtk_page_setup_new (); @@ -4501,8 +4501,8 @@ public class GTK extends OS { /** * @param setup cast=(GtkPageSetup *) */ - public static final native int _gtk_page_setup_get_orientation(long /*int*/ setup); - public static final int gtk_page_setup_get_orientation(long /*int*/ setup) { + public static final native int _gtk_page_setup_get_orientation(long setup); + public static final int gtk_page_setup_get_orientation(long setup) { lock.lock(); try { return _gtk_page_setup_get_orientation(setup); @@ -4514,8 +4514,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param orientation cast=(GtkPageOrientation) */ - public static final native void _gtk_page_setup_set_orientation(long /*int*/ setup, int orientation); - public static final void gtk_page_setup_set_orientation(long /*int*/ setup, int orientation) { + public static final native void _gtk_page_setup_set_orientation(long setup, int orientation); + public static final void gtk_page_setup_set_orientation(long setup, int orientation) { lock.lock(); try { _gtk_page_setup_set_orientation(setup, orientation); @@ -4526,8 +4526,8 @@ public class GTK extends OS { /** * @param setup cast=(GtkPageSetup *) */ - public static final native long /*int*/ _gtk_page_setup_get_paper_size(long /*int*/ setup); - public static final long /*int*/ gtk_page_setup_get_paper_size(long /*int*/ setup) { + public static final native long _gtk_page_setup_get_paper_size(long setup); + public static final long gtk_page_setup_get_paper_size(long setup) { lock.lock(); try { return _gtk_page_setup_get_paper_size(setup); @@ -4539,8 +4539,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param size cast=(GtkPaperSize *) */ - public static final native void _gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size); - public static final void gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size) { + public static final native void _gtk_page_setup_set_paper_size(long setup, long size); + public static final void gtk_page_setup_set_paper_size(long setup, long size) { lock.lock(); try { _gtk_page_setup_set_paper_size(setup, size); @@ -4552,8 +4552,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_page_setup_get_top_margin(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_top_margin(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_top_margin(long setup, int unit); + public static final double gtk_page_setup_get_top_margin(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_top_margin(setup, unit); @@ -4566,8 +4566,8 @@ public class GTK extends OS { * @param margin cast=(gdouble) * @param unit cast=(GtkUnit) */ - public static final native void _gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit); - public static final void gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit) { + public static final native void _gtk_page_setup_set_top_margin(long setup, double margin, int unit); + public static final void gtk_page_setup_set_top_margin(long setup, double margin, int unit) { lock.lock(); try { _gtk_page_setup_set_top_margin(setup, margin, unit); @@ -4580,8 +4580,8 @@ public class GTK extends OS { * @param unit cast=(GtkUnit) * */ - public static final native double _gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_bottom_margin(long setup, int unit); + public static final double gtk_page_setup_get_bottom_margin(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_bottom_margin(setup, unit); @@ -4594,8 +4594,8 @@ public class GTK extends OS { * @param margin cast=(gdouble) * @param unit cast=(GtkUnit) */ - public static final native void _gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit); - public static final void gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit) { + public static final native void _gtk_page_setup_set_bottom_margin(long setup, double margin, int unit); + public static final void gtk_page_setup_set_bottom_margin(long setup, double margin, int unit) { lock.lock(); try { _gtk_page_setup_set_bottom_margin(setup, margin, unit); @@ -4607,8 +4607,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_page_setup_get_left_margin(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_left_margin(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_left_margin(long setup, int unit); + public static final double gtk_page_setup_get_left_margin(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_left_margin(setup, unit); @@ -4621,8 +4621,8 @@ public class GTK extends OS { * @param margin cast=(gdouble) * @param unit cast=(GtkUnit) */ - public static final native void _gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit); - public static final void gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit) { + public static final native void _gtk_page_setup_set_left_margin(long setup, double margin, int unit); + public static final void gtk_page_setup_set_left_margin(long setup, double margin, int unit) { lock.lock(); try { _gtk_page_setup_set_left_margin(setup, margin, unit); @@ -4634,8 +4634,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_page_setup_get_right_margin(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_right_margin(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_right_margin(long setup, int unit); + public static final double gtk_page_setup_get_right_margin(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_right_margin(setup, unit); @@ -4648,8 +4648,8 @@ public class GTK extends OS { * @param margin cast=(gdouble) * @param unit cast=(GtkUnit) */ - public static final native void _gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit); - public static final void gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit) { + public static final native void _gtk_page_setup_set_right_margin(long setup, double margin, int unit); + public static final void gtk_page_setup_set_right_margin(long setup, double margin, int unit) { lock.lock(); try { _gtk_page_setup_set_right_margin(setup, margin, unit); @@ -4661,8 +4661,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_page_setup_get_paper_width(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_paper_width(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_paper_width(long setup, int unit); + public static final double gtk_page_setup_get_paper_width(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_paper_width(setup, unit); @@ -4674,8 +4674,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_page_setup_get_paper_height(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_paper_height(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_paper_height(long setup, int unit); + public static final double gtk_page_setup_get_paper_height(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_paper_height(setup, unit); @@ -4687,8 +4687,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_page_setup_get_page_width(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_page_width(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_page_width(long setup, int unit); + public static final double gtk_page_setup_get_page_width(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_page_width(setup, unit); @@ -4700,8 +4700,8 @@ public class GTK extends OS { * @param setup cast=(GtkPageSetup *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_page_setup_get_page_height(long /*int*/ setup, int unit); - public static final double gtk_page_setup_get_page_height(long /*int*/ setup, int unit) { + public static final native double _gtk_page_setup_get_page_height(long setup, int unit); + public static final double gtk_page_setup_get_page_height(long setup, int unit) { lock.lock(); try { return _gtk_page_setup_get_page_height(setup, unit); @@ -4717,8 +4717,8 @@ public class GTK extends OS { * @param width cast=(gdouble) * @param height cast=(gdouble) */ - public static final native void _gtk_render_frame(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height); - public static final void gtk_render_frame(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) { + public static final native void _gtk_render_frame(long context, long cr, double x , double y, double width, double height); + public static final void gtk_render_frame(long context, long cr, double x , double y, double width, double height) { lock.lock(); try { _gtk_render_frame(context, cr, x, y, width, height); @@ -4734,8 +4734,8 @@ public class GTK extends OS { * @param width cast=(gdouble) * @param height cast=(gdouble) */ - public static final native void _gtk_render_background(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height); - public static final void gtk_render_background(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) { + public static final native void _gtk_render_background(long context, long cr, double x , double y, double width, double height); + public static final void gtk_render_background(long context, long cr, double x , double y, double width, double height) { lock.lock(); try { _gtk_render_background(context, cr, x, y, width, height); @@ -4751,8 +4751,8 @@ public class GTK extends OS { * @param width cast=(gdouble) * @param height cast=(gdouble) */ - public static final native void _gtk_render_focus(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height); - public static final void gtk_render_focus(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) { + public static final native void _gtk_render_focus(long context, long cr, double x , double y, double width, double height); + public static final void gtk_render_focus(long context, long cr, double x , double y, double width, double height) { lock.lock(); try { _gtk_render_focus(context, cr, x, y, width, height); @@ -4763,8 +4763,8 @@ public class GTK extends OS { /** * @param size cast=(GtkPaperSize *) */ - public static final native void _gtk_paper_size_free(long /*int*/ size); - public static final void gtk_paper_size_free(long /*int*/ size) { + public static final native void _gtk_paper_size_free(long size); + public static final void gtk_paper_size_free(long size) { lock.lock(); try { _gtk_paper_size_free(size); @@ -4775,8 +4775,8 @@ public class GTK extends OS { /** * @param name cast=(const gchar *) */ - public static final native long /*int*/ _gtk_paper_size_new(byte [] name); - public static final long /*int*/ gtk_paper_size_new(byte [] name) { + public static final native long _gtk_paper_size_new(byte [] name); + public static final long gtk_paper_size_new(byte [] name) { lock.lock(); try { return _gtk_paper_size_new(name); @@ -4790,8 +4790,8 @@ public class GTK extends OS { * @param width cast=(gdouble) * @param height cast=(gdouble) */ - public static final native long /*int*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height); - public static final long /*int*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) { + public static final native long _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height); + public static final long gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) { lock.lock(); try { return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height); @@ -4806,8 +4806,8 @@ public class GTK extends OS { * @param height cast=(gdouble) * @param unit cast=(GtkUnit) */ - public static final native long /*int*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit); - public static final long /*int*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) { + public static final native long _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit); + public static final long gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) { lock.lock(); try { return _gtk_paper_size_new_custom(name, display_name, width, height, unit); @@ -4818,8 +4818,8 @@ public class GTK extends OS { /** * @param size cast=(GtkPaperSize *) */ - public static final native long /*int*/ _gtk_paper_size_get_name(long /*int*/ size); - public static final long /*int*/ gtk_paper_size_get_name(long /*int*/ size) { + public static final native long _gtk_paper_size_get_name(long size); + public static final long gtk_paper_size_get_name(long size) { lock.lock(); try { return _gtk_paper_size_get_name(size); @@ -4830,8 +4830,8 @@ public class GTK extends OS { /** * @param size cast=(GtkPaperSize *) */ - public static final native long /*int*/ _gtk_paper_size_get_display_name(long /*int*/ size); - public static final long /*int*/ gtk_paper_size_get_display_name(long /*int*/ size) { + public static final native long _gtk_paper_size_get_display_name(long size); + public static final long gtk_paper_size_get_display_name(long size) { lock.lock(); try { return _gtk_paper_size_get_display_name(size); @@ -4842,8 +4842,8 @@ public class GTK extends OS { /** * @param size cast=(GtkPaperSize *) */ - public static final native long /*int*/ _gtk_paper_size_get_ppd_name(long /*int*/ size); - public static final long /*int*/ gtk_paper_size_get_ppd_name(long /*int*/ size) { + public static final native long _gtk_paper_size_get_ppd_name(long size); + public static final long gtk_paper_size_get_ppd_name(long size) { lock.lock(); try { return _gtk_paper_size_get_ppd_name(size); @@ -4855,8 +4855,8 @@ public class GTK extends OS { * @param size cast=(GtkPaperSize *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_paper_size_get_width(long /*int*/ size, int unit); - public static final double gtk_paper_size_get_width(long /*int*/ size, int unit) { + public static final native double _gtk_paper_size_get_width(long size, int unit); + public static final double gtk_paper_size_get_width(long size, int unit) { lock.lock(); try { return _gtk_paper_size_get_width(size, unit); @@ -4868,8 +4868,8 @@ public class GTK extends OS { * @param size cast=(GtkPaperSize *) * @param unit cast=(GtkUnit) */ - public static final native double _gtk_paper_size_get_height(long /*int*/ size, int unit); - public static final double gtk_paper_size_get_height(long /*int*/ size, int unit) { + public static final native double _gtk_paper_size_get_height(long size, int unit); + public static final double gtk_paper_size_get_height(long size, int unit) { lock.lock(); try { return _gtk_paper_size_get_height(size, unit); @@ -4880,8 +4880,8 @@ public class GTK extends OS { /** * @param size cast=(GtkPaperSize *) */ - public static final native boolean _gtk_paper_size_is_custom(long /*int*/ size); - public static final boolean gtk_paper_size_is_custom(long /*int*/ size) { + public static final native boolean _gtk_paper_size_is_custom(long size); + public static final boolean gtk_paper_size_is_custom(long size) { lock.lock(); try { return _gtk_paper_size_is_custom(size); @@ -4889,8 +4889,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_plug_new(long /*int*/ socket_id); - public static final long /*int*/ gtk_plug_new(long /*int*/ socket_id) { + public static final native long _gtk_plug_new(long socket_id); + public static final long gtk_plug_new(long socket_id) { lock.lock(); try { return _gtk_plug_new(socket_id); @@ -4901,8 +4901,8 @@ public class GTK extends OS { /** * @param printer cast=(GtkPrinter *) */ - public static final native long /*int*/ _gtk_printer_get_backend(long /*int*/ printer); - public static final long /*int*/ gtk_printer_get_backend(long /*int*/ printer) { + public static final native long _gtk_printer_get_backend(long printer); + public static final long gtk_printer_get_backend(long printer) { lock.lock(); try { return _gtk_printer_get_backend(printer); @@ -4913,8 +4913,8 @@ public class GTK extends OS { /** * @param printer cast=(GtkPrinter *) */ - public static final native long /*int*/ _gtk_printer_get_name(long /*int*/ printer); - public static final long /*int*/ gtk_printer_get_name(long /*int*/ printer) { + public static final native long _gtk_printer_get_name(long printer); + public static final long gtk_printer_get_name(long printer) { lock.lock(); try { return _gtk_printer_get_name(printer); @@ -4925,8 +4925,8 @@ public class GTK extends OS { /** * @param printer cast=(GtkPrinter *) */ - public static final native boolean _gtk_printer_is_default(long /*int*/ printer); - public static final boolean gtk_printer_is_default(long /*int*/ printer) { + public static final native boolean _gtk_printer_is_default(long printer); + public static final boolean gtk_printer_is_default(long printer) { lock.lock(); try { return _gtk_printer_is_default(printer); @@ -4940,8 +4940,8 @@ public class GTK extends OS { * @param destroy cast=(GDestroyNotify) * @param wait cast=(gboolean) */ - public static final native void _gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait); - public static final void gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait) { + public static final native void _gtk_enumerate_printers(long func, long /*int*/data, long destroy, boolean wait); + public static final void gtk_enumerate_printers(long func, long /*int*/data, long destroy, boolean wait) { lock.lock(); try { _gtk_enumerate_printers(func, data, destroy, wait); @@ -4955,8 +4955,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param page_setup cast=(GtkPageSetup *) */ - public static final native long /*int*/ _gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup); - public static final long /*int*/ gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup) { + public static final native long _gtk_print_job_new(byte[] title, long printer, long settings, long page_setup); + public static final long gtk_print_job_new(byte[] title, long printer, long settings, long page_setup) { lock.lock(); try { return _gtk_print_job_new(title, printer, settings, page_setup); @@ -4968,8 +4968,8 @@ public class GTK extends OS { * @param job cast=(GtkPrintJob *) * @param error cast=(GError **) */ - public static final native long /*int*/ _gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]); - public static final long /*int*/ gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]) { + public static final native long _gtk_print_job_get_surface(long job, long error[]); + public static final long gtk_print_job_get_surface(long job, long error[]) { lock.lock(); try { return _gtk_print_job_get_surface(job, error); @@ -4983,8 +4983,8 @@ public class GTK extends OS { * @param user_data cast=(gpointer) * @param dnotify cast=(GDestroyNotify) */ - public static final native void _gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify); - public static final void gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify) { + public static final native void _gtk_print_job_send(long job, long callback, long user_data, long dnotify); + public static final void gtk_print_job_send(long job, long callback, long user_data, long dnotify) { lock.lock(); try { _gtk_print_job_send(job, callback, user_data, dnotify); @@ -4992,8 +4992,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_print_settings_new(); - public static final long /*int*/ gtk_print_settings_new() { + public static final native long _gtk_print_settings_new(); + public static final long gtk_print_settings_new() { lock.lock(); try { return _gtk_print_settings_new(); @@ -5006,8 +5006,8 @@ public class GTK extends OS { * @param func cast=(GtkPrintSettingsFunc) * @param data cast=(gpointer) */ - public static final native void _gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data); - public static final void gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data) { + public static final native void _gtk_print_settings_foreach(long settings, long func, long data); + public static final void gtk_print_settings_foreach(long settings, long func, long data) { lock.lock(); try { _gtk_print_settings_foreach(settings, func, data); @@ -5019,8 +5019,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param key cast=(const gchar *) */ - public static final native long /*int*/ _gtk_print_settings_get(long /*int*/ settings, byte [] key); - public static final long /*int*/ gtk_print_settings_get(long /*int*/ settings, byte [] key) { + public static final native long _gtk_print_settings_get(long settings, byte [] key); + public static final long gtk_print_settings_get(long settings, byte [] key) { lock.lock(); try { return _gtk_print_settings_get(settings, key); @@ -5033,8 +5033,8 @@ public class GTK extends OS { * @param key cast=(const gchar *) * @param value cast=(const gchar *) */ - public static final native void _gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value); - public static final void gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value) { + public static final native void _gtk_print_settings_set(long settings, byte [] key, byte [] value); + public static final void gtk_print_settings_set(long settings, byte [] key, byte [] value) { lock.lock(); try { _gtk_print_settings_set(settings, key, value); @@ -5046,8 +5046,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param printer cast=(const gchar *) */ - public static final native void _gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer); - public static final void gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer) { + public static final native void _gtk_print_settings_set_printer(long settings, byte[] printer); + public static final void gtk_print_settings_set_printer(long settings, byte[] printer) { lock.lock(); try { _gtk_print_settings_set_printer(settings, printer); @@ -5059,8 +5059,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param orientation cast=(GtkPageOrientation) */ - public static final native void _gtk_print_settings_set_orientation(long /*int*/ settings, int orientation); - public static final void gtk_print_settings_set_orientation(long /*int*/ settings, int orientation) { + public static final native void _gtk_print_settings_set_orientation(long settings, int orientation); + public static final void gtk_print_settings_set_orientation(long settings, int orientation) { lock.lock(); try { _gtk_print_settings_set_orientation(settings, orientation); @@ -5071,8 +5071,8 @@ public class GTK extends OS { /** * @param settings cast=(GtkPrintSettings *) */ - public static final native boolean _gtk_print_settings_get_collate(long /*int*/ settings); - public static final boolean gtk_print_settings_get_collate(long /*int*/ settings) { + public static final native boolean _gtk_print_settings_get_collate(long settings); + public static final boolean gtk_print_settings_get_collate(long settings) { lock.lock(); try { return _gtk_print_settings_get_collate(settings); @@ -5084,8 +5084,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param collate cast=(gboolean) */ - public static final native void _gtk_print_settings_set_collate(long /*int*/ settings, boolean collate); - public static final void gtk_print_settings_set_collate(long /*int*/ settings, boolean collate) { + public static final native void _gtk_print_settings_set_collate(long settings, boolean collate); + public static final void gtk_print_settings_set_collate(long settings, boolean collate) { lock.lock(); try { _gtk_print_settings_set_collate(settings, collate); @@ -5096,8 +5096,8 @@ public class GTK extends OS { /** * @param settings cast=(GtkPrintSettings *) */ - public static final native int _gtk_print_settings_get_duplex(long /*int*/ settings); - public static final int gtk_print_settings_get_duplex(long /*int*/ settings) { + public static final native int _gtk_print_settings_get_duplex(long settings); + public static final int gtk_print_settings_get_duplex(long settings) { lock.lock(); try { return _gtk_print_settings_get_duplex(settings); @@ -5109,8 +5109,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param duplex cast=(GtkPrintDuplex) */ - public static final native void _gtk_print_settings_set_duplex(long /*int*/ settings, int duplex); - public static final void gtk_print_settings_set_duplex(long /*int*/ settings, int duplex) { + public static final native void _gtk_print_settings_set_duplex(long settings, int duplex); + public static final void gtk_print_settings_set_duplex(long settings, int duplex) { lock.lock(); try { _gtk_print_settings_set_duplex(settings, duplex); @@ -5121,8 +5121,8 @@ public class GTK extends OS { /** * @param settings cast=(GtkPrintSettings *) */ - public static final native int _gtk_print_settings_get_n_copies(long /*int*/ settings); - public static final int gtk_print_settings_get_n_copies(long /*int*/ settings) { + public static final native int _gtk_print_settings_get_n_copies(long settings); + public static final int gtk_print_settings_get_n_copies(long settings) { lock.lock(); try { return _gtk_print_settings_get_n_copies(settings); @@ -5134,8 +5134,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param num_copies cast=(gint) */ - public static final native void _gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies); - public static final void gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies) { + public static final native void _gtk_print_settings_set_n_copies(long settings, int num_copies); + public static final void gtk_print_settings_set_n_copies(long settings, int num_copies) { lock.lock(); try { _gtk_print_settings_set_n_copies(settings, num_copies); @@ -5146,8 +5146,8 @@ public class GTK extends OS { /** * @param settings cast=(GtkPrintSettings *) */ - public static final native int _gtk_print_settings_get_print_pages(long /*int*/ settings); - public static final int gtk_print_settings_get_print_pages(long /*int*/ settings) { + public static final native int _gtk_print_settings_get_print_pages(long settings); + public static final int gtk_print_settings_get_print_pages(long settings) { lock.lock(); try { return _gtk_print_settings_get_print_pages(settings); @@ -5159,8 +5159,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param pages cast=(GtkPrintPages) */ - public static final native void _gtk_print_settings_set_print_pages(long /*int*/ settings, int pages); - public static final void gtk_print_settings_set_print_pages(long /*int*/ settings, int pages) { + public static final native void _gtk_print_settings_set_print_pages(long settings, int pages); + public static final void gtk_print_settings_set_print_pages(long settings, int pages) { lock.lock(); try { _gtk_print_settings_set_print_pages(settings, pages); @@ -5172,8 +5172,8 @@ public class GTK extends OS { * @param settings cast=(GtkPrintSettings *) * @param num_ranges cast=(gint *) */ - public static final native long /*int*/ _gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges); - public static final long /*int*/ gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges) { + public static final native long _gtk_print_settings_get_page_ranges(long settings, int[] num_ranges); + public static final long gtk_print_settings_get_page_ranges(long settings, int[] num_ranges) { lock.lock(); try { return _gtk_print_settings_get_page_ranges(settings, num_ranges); @@ -5186,8 +5186,8 @@ public class GTK extends OS { * @param page_ranges cast=(GtkPageRange *) * @param num_ranges cast=(gint) */ - public static final native void _gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges); - public static final void gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges) { + public static final native void _gtk_print_settings_set_page_ranges(long settings, int[] page_ranges, int num_ranges); + public static final void gtk_print_settings_set_page_ranges(long settings, int[] page_ranges, int num_ranges) { lock.lock(); try { _gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges); @@ -5198,8 +5198,8 @@ public class GTK extends OS { /** * @param settings cast=(GtkPrintSettings *) */ - public static final native int _gtk_print_settings_get_resolution(long /*int*/ settings); - public static final int gtk_print_settings_get_resolution(long /*int*/ settings) { + public static final native int _gtk_print_settings_get_resolution(long settings); + public static final int gtk_print_settings_get_resolution(long settings) { lock.lock(); try { return _gtk_print_settings_get_resolution(settings); @@ -5211,8 +5211,8 @@ public class GTK extends OS { * @param title cast=(const gchar *) * @param parent cast=(GtkWindow *) */ - public static final native long /*int*/ _gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent); - public static final long /*int*/ gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent) { + public static final native long _gtk_print_unix_dialog_new(byte[] title, long parent); + public static final long gtk_print_unix_dialog_new(byte[] title, long parent) { lock.lock(); try { return _gtk_print_unix_dialog_new(title, parent); @@ -5224,8 +5224,8 @@ public class GTK extends OS { * @param dialog cast=(GtkPrintUnixDialog *) * @param embed cast=(gboolean) */ - public static final native void _gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed); - public static final void gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed) { + public static final native void _gtk_print_unix_dialog_set_embed_page_setup(long dialog, boolean embed); + public static final void gtk_print_unix_dialog_set_embed_page_setup(long dialog, boolean embed) { lock.lock(); try { _gtk_print_unix_dialog_set_embed_page_setup(dialog, embed); @@ -5237,8 +5237,8 @@ public class GTK extends OS { * @param dialog cast=(GtkPrintUnixDialog *) * @param page_setup cast=(GtkPageSetup *) */ - public static final native void _gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup); - public static final void gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup) { + public static final native void _gtk_print_unix_dialog_set_page_setup(long dialog, long page_setup); + public static final void gtk_print_unix_dialog_set_page_setup(long dialog, long page_setup) { lock.lock(); try { _gtk_print_unix_dialog_set_page_setup(dialog, page_setup); @@ -5249,8 +5249,8 @@ public class GTK extends OS { /** * @param dialog cast=(GtkPrintUnixDialog *) */ - public static final native long /*int*/ _gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog); - public static final long /*int*/ gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog) { + public static final native long _gtk_print_unix_dialog_get_page_setup(long dialog); + public static final long gtk_print_unix_dialog_get_page_setup(long dialog) { lock.lock(); try { return _gtk_print_unix_dialog_get_page_setup(dialog); @@ -5262,8 +5262,8 @@ public class GTK extends OS { * @param dialog cast=(GtkPrintUnixDialog *) * @param current_page cast=(gint) */ - public static final native void _gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page); - public static final void gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page) { + public static final native void _gtk_print_unix_dialog_set_current_page(long dialog, int current_page); + public static final void gtk_print_unix_dialog_set_current_page(long dialog, int current_page) { lock.lock(); try { _gtk_print_unix_dialog_set_current_page(dialog, current_page); @@ -5274,8 +5274,8 @@ public class GTK extends OS { /** * @param dialog cast=(GtkPrintUnixDialog *) */ - public static final native int _gtk_print_unix_dialog_get_current_page(long /*int*/ dialog); - public static final int gtk_print_unix_dialog_get_current_page(long /*int*/ dialog) { + public static final native int _gtk_print_unix_dialog_get_current_page(long dialog); + public static final int gtk_print_unix_dialog_get_current_page(long dialog) { lock.lock(); try { return _gtk_print_unix_dialog_get_current_page(dialog); @@ -5287,8 +5287,8 @@ public class GTK extends OS { * @param dialog cast=(GtkPrintUnixDialog *) * @param settings cast=(GtkPrintSettings *) */ - public static final native void _gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings); - public static final void gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings) { + public static final native void _gtk_print_unix_dialog_set_settings(long dialog, long settings); + public static final void gtk_print_unix_dialog_set_settings(long dialog, long settings) { lock.lock(); try { _gtk_print_unix_dialog_set_settings(dialog, settings); @@ -5299,8 +5299,8 @@ public class GTK extends OS { /** * @param dialog cast=(GtkPrintUnixDialog *) */ - public static final native long /*int*/ _gtk_print_unix_dialog_get_settings(long /*int*/ dialog); - public static final long /*int*/ gtk_print_unix_dialog_get_settings(long /*int*/ dialog) { + public static final native long _gtk_print_unix_dialog_get_settings(long dialog); + public static final long gtk_print_unix_dialog_get_settings(long dialog) { lock.lock(); try { return _gtk_print_unix_dialog_get_settings(dialog); @@ -5311,8 +5311,8 @@ public class GTK extends OS { /** * @param dialog cast=(GtkPrintUnixDialog *) */ - public static final native long /*int*/ _gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog); - public static final long /*int*/ gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog) { + public static final native long _gtk_print_unix_dialog_get_selected_printer(long dialog); + public static final long gtk_print_unix_dialog_get_selected_printer(long dialog) { lock.lock(); try { return _gtk_print_unix_dialog_get_selected_printer(dialog); @@ -5324,8 +5324,8 @@ public class GTK extends OS { * @param dialog cast=(GtkPrintUnixDialog *) * @param capabilities cast=(GtkPrintCapabilities) */ - public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities); - public static final void gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities) { + public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long dialog, long capabilities); + public static final void gtk_print_unix_dialog_set_manual_capabilities(long dialog, long capabilities) { lock.lock(); try { _gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities); @@ -5333,8 +5333,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_progress_bar_new(); - public static final long /*int*/ gtk_progress_bar_new() { + public static final native long _gtk_progress_bar_new(); + public static final long gtk_progress_bar_new() { lock.lock(); try { return _gtk_progress_bar_new(); @@ -5343,8 +5343,8 @@ public class GTK extends OS { } } /** @param pbar cast=(GtkProgressBar *) */ - public static final native void _gtk_progress_bar_pulse(long /*int*/ pbar); - public static final void gtk_progress_bar_pulse(long /*int*/ pbar) { + public static final native void _gtk_progress_bar_pulse(long pbar); + public static final void gtk_progress_bar_pulse(long pbar) { lock.lock(); try { _gtk_progress_bar_pulse(pbar); @@ -5356,8 +5356,8 @@ public class GTK extends OS { * @param pbar cast=(GtkProgressBar *) * @param fraction cast=(gdouble) */ - public static final native void _gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction); - public static final void gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction) { + public static final native void _gtk_progress_bar_set_fraction(long pbar, double fraction); + public static final void gtk_progress_bar_set_fraction(long pbar, double fraction) { lock.lock(); try { _gtk_progress_bar_set_fraction(pbar, fraction); @@ -5369,8 +5369,8 @@ public class GTK extends OS { * @param pbar cast=(GtkProgressBar *) * @param inverted cast=(gboolean) */ - public static final native void _gtk_progress_bar_set_inverted(long /*int*/ pbar, boolean inverted); - public static final void gtk_progress_bar_set_inverted(long /*int*/ pbar, boolean inverted) { + public static final native void _gtk_progress_bar_set_inverted(long pbar, boolean inverted); + public static final void gtk_progress_bar_set_inverted(long pbar, boolean inverted) { lock.lock(); try { _gtk_progress_bar_set_inverted(pbar, inverted); @@ -5379,8 +5379,8 @@ public class GTK extends OS { } } /** @param radio_button cast=(GtkRadioButton *) */ - public static final native long /*int*/ _gtk_radio_button_get_group(long /*int*/ radio_button); - public static final long /*int*/ gtk_radio_button_get_group(long /*int*/ radio_button) { + public static final native long _gtk_radio_button_get_group(long radio_button); + public static final long gtk_radio_button_get_group(long radio_button) { lock.lock(); try { return _gtk_radio_button_get_group(radio_button); @@ -5389,8 +5389,8 @@ public class GTK extends OS { } } /** @param group cast=(GSList *) */ - public static final native long /*int*/ _gtk_radio_button_new(long /*int*/ group); - public static final long /*int*/ gtk_radio_button_new(long /*int*/ group) { + public static final native long _gtk_radio_button_new(long group); + public static final long gtk_radio_button_new(long group) { lock.lock(); try { return _gtk_radio_button_new(group); @@ -5399,8 +5399,8 @@ public class GTK extends OS { } } /** @param radio_menu_item cast=(GtkRadioMenuItem *) */ - public static final native long /*int*/ _gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item); - public static final long /*int*/ gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item) { + public static final native long _gtk_radio_menu_item_get_group(long radio_menu_item); + public static final long gtk_radio_menu_item_get_group(long radio_menu_item) { lock.lock(); try { return _gtk_radio_menu_item_get_group(radio_menu_item); @@ -5409,8 +5409,8 @@ public class GTK extends OS { } } /** @param group cast=(GSList *) */ - public static final native long /*int*/ _gtk_radio_menu_item_new(long /*int*/ group); - public static final long /*int*/ gtk_radio_menu_item_new(long /*int*/ group) { + public static final native long _gtk_radio_menu_item_new(long group); + public static final long gtk_radio_menu_item_new(long group) { lock.lock(); try { return _gtk_radio_menu_item_new(group); @@ -5419,8 +5419,8 @@ public class GTK extends OS { } } /** @param range cast=(GtkRange *) */ - public static final native long /*int*/ _gtk_range_get_adjustment(long /*int*/ range); - public static final long /*int*/ gtk_range_get_adjustment(long /*int*/ range) { + public static final native long _gtk_range_get_adjustment(long range); + public static final long gtk_range_get_adjustment(long range) { lock.lock(); try { return _gtk_range_get_adjustment(range); @@ -5429,8 +5429,8 @@ public class GTK extends OS { } } /** @param range cast=(GtkRange *) */ - public static final native void _gtk_range_set_increments(long /*int*/ range, double step, double page); - public static final void gtk_range_set_increments(long /*int*/ range, double step, double page) { + public static final native void _gtk_range_set_increments(long range, double step, double page); + public static final void gtk_range_set_increments(long range, double step, double page) { lock.lock(); try { _gtk_range_set_increments(range, step, page); @@ -5439,8 +5439,8 @@ public class GTK extends OS { } } /** @param range cast=(GtkRange *) */ - public static final native void _gtk_range_set_inverted(long /*int*/ range, boolean setting); - public static final void gtk_range_set_inverted(long /*int*/ range, boolean setting) { + public static final native void _gtk_range_set_inverted(long range, boolean setting); + public static final void gtk_range_set_inverted(long range, boolean setting) { lock.lock(); try { _gtk_range_set_inverted(range, setting); @@ -5449,8 +5449,8 @@ public class GTK extends OS { } } /** @param range cast=(GtkRange *) */ - public static final native void _gtk_range_set_range(long /*int*/ range, double min, double max); - public static final void gtk_range_set_range(long /*int*/ range, double min, double max) { + public static final native void _gtk_range_set_range(long range, double min, double max); + public static final void gtk_range_set_range(long range, double min, double max) { lock.lock(); try { _gtk_range_set_range(range, min, max); @@ -5459,8 +5459,8 @@ public class GTK extends OS { } } /** @param range cast=(GtkRange *) */ - public static final native void _gtk_range_set_value(long /*int*/ range, double value); - public static final void gtk_range_set_value(long /*int*/ range, double value) { + public static final native void _gtk_range_set_value(long range, double value); + public static final void gtk_range_set_value(long range, double value) { lock.lock(); try { _gtk_range_set_value(range, value); @@ -5473,8 +5473,8 @@ public class GTK extends OS { * @param slider_start cast=(gint *) * @param slider_end cast=(gint *) */ - public static final native void _gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end); - public static final void gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end) { + public static final native void _gtk_range_get_slider_range(long range, int[] slider_start, int[] slider_end); + public static final void gtk_range_get_slider_range(long range, int[] slider_start, int[] slider_end) { lock.lock(); try { _gtk_range_get_slider_range(range, slider_start, slider_end); @@ -5486,8 +5486,8 @@ public class GTK extends OS { * @param scale cast=(GtkScale *) * @param digits cast=(gint) */ - public static final native void _gtk_scale_set_digits(long /*int*/ scale, int digits); - public static final void gtk_scale_set_digits(long /*int*/ scale, int digits) { + public static final native void _gtk_scale_set_digits(long scale, int digits); + public static final void gtk_scale_set_digits(long scale, int digits) { lock.lock(); try { _gtk_scale_set_digits(scale, digits); @@ -5499,8 +5499,8 @@ public class GTK extends OS { * @param scale cast=(GtkScale *) * @param draw_value cast=(gboolean) */ - public static final native void _gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value); - public static final void gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value) { + public static final native void _gtk_scale_set_draw_value(long scale, boolean draw_value); + public static final void gtk_scale_set_draw_value(long scale, boolean draw_value) { lock.lock(); try { _gtk_scale_set_draw_value(scale, draw_value); @@ -5511,8 +5511,8 @@ public class GTK extends OS { /** * @param scrollable cast=(GtkScrollable *) */ - public static final native long /*int*/ _gtk_scrollable_get_vadjustment(long /*int*/ scrollable); - public static final long /*int*/ gtk_scrollable_get_vadjustment(long /*int*/ scrollable) { + public static final native long _gtk_scrollable_get_vadjustment(long scrollable); + public static final long gtk_scrollable_get_vadjustment(long scrollable) { lock.lock(); try { return _gtk_scrollable_get_vadjustment(scrollable); @@ -5521,8 +5521,8 @@ public class GTK extends OS { } } /** @param scrolled_window cast=(GtkScrolledWindow *) */ - public static final native long /*int*/ _gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window); - public static final long /*int*/ gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window) { + public static final native long _gtk_scrolled_window_get_hadjustment(long scrolled_window); + public static final long gtk_scrolled_window_get_hadjustment(long scrolled_window) { lock.lock(); try { return _gtk_scrolled_window_get_hadjustment(scrolled_window); @@ -5533,8 +5533,8 @@ public class GTK extends OS { /** * @param scrolled_window cast=(GtkScrolledWindow *) */ - public static final native long /*int*/ _gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window); - public static final long /*int*/ gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window) { + public static final native long _gtk_scrolled_window_get_hscrollbar(long scrolled_window); + public static final long gtk_scrolled_window_get_hscrollbar(long scrolled_window) { lock.lock(); try { return _gtk_scrolled_window_get_hscrollbar(scrolled_window); @@ -5547,8 +5547,8 @@ public class GTK extends OS { * @param hscrollbar_policy cast=(GtkPolicyType *) * @param vscrollbar_policy cast=(GtkPolicyType *) */ - public static final native void _gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy); - public static final void gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) { + public static final native void _gtk_scrolled_window_get_policy(long scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy); + public static final void gtk_scrolled_window_get_policy(long scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) { lock.lock(); try { _gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy); @@ -5557,8 +5557,8 @@ public class GTK extends OS { } } /** @param scrolled_window cast=(GtkScrolledWindow *) */ - public static final native int _gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window); - public static final int gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window) { + public static final native int _gtk_scrolled_window_get_shadow_type(long scrolled_window); + public static final int gtk_scrolled_window_get_shadow_type(long scrolled_window) { lock.lock(); try { return _gtk_scrolled_window_get_shadow_type(scrolled_window); @@ -5567,8 +5567,8 @@ public class GTK extends OS { } } /** @param scrolled_window cast=(GtkScrolledWindow *) */ - public static final native long /*int*/ _gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window); - public static final long /*int*/ gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window) { + public static final native long _gtk_scrolled_window_get_vadjustment(long scrolled_window); + public static final long gtk_scrolled_window_get_vadjustment(long scrolled_window) { lock.lock(); try { return _gtk_scrolled_window_get_vadjustment(scrolled_window); @@ -5579,8 +5579,8 @@ public class GTK extends OS { /** * @param scrolled_window cast=(GtkScrolledWindow *) */ - public static final native long /*int*/ _gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window); - public static final long /*int*/ gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window) { + public static final native long _gtk_scrolled_window_get_vscrollbar(long scrolled_window); + public static final long gtk_scrolled_window_get_vscrollbar(long scrolled_window) { lock.lock(); try { return _gtk_scrolled_window_get_vscrollbar(scrolled_window); @@ -5592,8 +5592,8 @@ public class GTK extends OS { * @param hadjustment cast=(GtkAdjustment *) * @param vadjustment cast=(GtkAdjustment *) */ - public static final native long /*int*/ _gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment); - public static final long /*int*/ gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment) { + public static final native long _gtk_scrolled_window_new(long hadjustment, long vadjustment); + public static final long gtk_scrolled_window_new(long hadjustment, long vadjustment) { lock.lock(); try { return _gtk_scrolled_window_new(hadjustment, vadjustment); @@ -5606,8 +5606,8 @@ public class GTK extends OS { * @param hscrollbar_policy cast=(GtkPolicyType) * @param vscrollbar_policy cast=(GtkPolicyType) */ - public static final native void _gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy); - public static final void gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) { + public static final native void _gtk_scrolled_window_set_policy(long scrolled_window, int hscrollbar_policy, int vscrollbar_policy); + public static final void gtk_scrolled_window_set_policy(long scrolled_window, int hscrollbar_policy, int vscrollbar_policy) { lock.lock(); try { _gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy); @@ -5619,8 +5619,8 @@ public class GTK extends OS { * @method flags=dynamic * @param scrolled_window cast=(GtkScrolledWindow *) */ - public static final native boolean _gtk_scrolled_window_get_overlay_scrolling(long /*int*/ scrolled_window); - public static final boolean gtk_scrolled_window_get_overlay_scrolling(long /*int*/ scrolled_window) { + public static final native boolean _gtk_scrolled_window_get_overlay_scrolling(long scrolled_window); + public static final boolean gtk_scrolled_window_get_overlay_scrolling(long scrolled_window) { lock.lock(); try { return _gtk_scrolled_window_get_overlay_scrolling(scrolled_window); @@ -5632,8 +5632,8 @@ public class GTK extends OS { * @param scrolled_window cast=(GtkScrolledWindow *) * @param type cast=(GtkShadowType) */ - public static final native void _gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type); - public static final void gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type) { + public static final native void _gtk_scrolled_window_set_shadow_type(long scrolled_window, int type); + public static final void gtk_scrolled_window_set_shadow_type(long scrolled_window, int type) { lock.lock(); try { _gtk_scrolled_window_set_shadow_type(scrolled_window, type); @@ -5641,8 +5641,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_settings_get_default(); - public static final long /*int*/ gtk_settings_get_default() { + public static final native long _gtk_settings_get_default(); + public static final long gtk_settings_get_default() { lock.lock(); try { return _gtk_settings_get_default(); @@ -5651,8 +5651,8 @@ public class GTK extends OS { } } /** @param selection_data cast=(GtkSelectionData *) */ - public static final native void _gtk_selection_data_free(long /*int*/ selection_data); - public static final void gtk_selection_data_free(long /*int*/ selection_data) { + public static final native void _gtk_selection_data_free(long selection_data); + public static final void gtk_selection_data_free(long selection_data) { lock.lock(); try { _gtk_selection_data_free(selection_data); @@ -5663,8 +5663,8 @@ public class GTK extends OS { /** * @param selection_data cast=(GtkSelectionData *) */ - public static final native long /*int*/ _gtk_selection_data_get_data(long /*int*/ selection_data); - public static final long /*int*/ gtk_selection_data_get_data(long /*int*/ selection_data) { + public static final native long _gtk_selection_data_get_data(long selection_data); + public static final long gtk_selection_data_get_data(long selection_data) { lock.lock(); try { return _gtk_selection_data_get_data(selection_data); @@ -5675,8 +5675,8 @@ public class GTK extends OS { /** * @param selection_data cast=(GtkSelectionData *) */ - public static final native int _gtk_selection_data_get_format(long /*int*/ selection_data); - public static final int gtk_selection_data_get_format(long /*int*/ selection_data) { + public static final native int _gtk_selection_data_get_format(long selection_data); + public static final int gtk_selection_data_get_format(long selection_data) { lock.lock(); try { return _gtk_selection_data_get_format(selection_data); @@ -5687,8 +5687,8 @@ public class GTK extends OS { /** * @param selection_data cast=(GtkSelectionData *) */ - public static final native int _gtk_selection_data_get_length(long /*int*/ selection_data); - public static final int gtk_selection_data_get_length(long /*int*/ selection_data) { + public static final native int _gtk_selection_data_get_length(long selection_data); + public static final int gtk_selection_data_get_length(long selection_data) { lock.lock(); try { return _gtk_selection_data_get_length(selection_data); @@ -5699,8 +5699,8 @@ public class GTK extends OS { /** * @param selection_data cast=(GtkSelectionData *) */ - public static final native long /*int*/ _gtk_selection_data_get_target(long /*int*/ selection_data); - public static final long /*int*/ gtk_selection_data_get_target(long /*int*/ selection_data) { + public static final native long _gtk_selection_data_get_target(long selection_data); + public static final long gtk_selection_data_get_target(long selection_data) { lock.lock(); try { return _gtk_selection_data_get_target(selection_data); @@ -5711,8 +5711,8 @@ public class GTK extends OS { /** * @param selection_data cast=(GtkSelectionData *) */ - public static final native long /*int*/ _gtk_selection_data_get_data_type(long /*int*/ selection_data); - public static final long /*int*/ gtk_selection_data_get_data_type(long /*int*/ selection_data) { + public static final native long _gtk_selection_data_get_data_type(long selection_data); + public static final long gtk_selection_data_get_data_type(long selection_data) { lock.lock(); try { return _gtk_selection_data_get_data_type(selection_data); @@ -5727,8 +5727,8 @@ public class GTK extends OS { * @param data cast=(const guchar *) * @param length cast=(gint) */ - public static final native void _gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length); - public static final void gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length) { + public static final native void _gtk_selection_data_set(long selection_data, long type, int format, long data, int length); + public static final void gtk_selection_data_set(long selection_data, long type, int format, long data, int length) { lock.lock(); try { _gtk_selection_data_set(selection_data, type, format, data, length); @@ -5736,8 +5736,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_separator_menu_item_new(); - public static final long /*int*/ gtk_separator_menu_item_new() { + public static final native long _gtk_separator_menu_item_new(); + public static final long gtk_separator_menu_item_new() { lock.lock(); try { return _gtk_separator_menu_item_new(); @@ -5745,8 +5745,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_separator_tool_item_new(); - public static final long /*int*/ gtk_separator_tool_item_new() { + public static final native long _gtk_separator_tool_item_new(); + public static final long gtk_separator_tool_item_new() { lock.lock(); try { return _gtk_separator_tool_item_new(); @@ -5758,8 +5758,8 @@ public class GTK extends OS { * @param item cast=(GtkSeparatorToolItem *) * @param draw cast=(gboolean) */ - public static final native void _gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw); - public static final void gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw) { + public static final native void _gtk_separator_tool_item_set_draw(long item, boolean draw); + public static final void gtk_separator_tool_item_set_draw(long item, boolean draw) { lock.lock(); try { _gtk_separator_tool_item_set_draw(item, draw); @@ -5768,8 +5768,8 @@ public class GTK extends OS { } } /** @param socket cast=(GtkSocket *) */ - public static final native long /*int*/ _gtk_socket_get_id(long /*int*/ socket); - public static final long /*int*/ gtk_socket_get_id(long /*int*/ socket) { + public static final native long _gtk_socket_get_id(long socket); + public static final long gtk_socket_get_id(long socket) { lock.lock(); try { return _gtk_socket_get_id(socket); @@ -5777,8 +5777,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_socket_new(); - public static final long /*int*/ gtk_socket_new() { + public static final native long _gtk_socket_new(); + public static final long gtk_socket_new() { lock.lock(); try { return _gtk_socket_new(); @@ -5787,8 +5787,8 @@ public class GTK extends OS { } } /** @param adjustment cast=(GtkAdjustment *) */ - public static final native long /*int*/ _gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits); - public static final long /*int*/ gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits) { + public static final native long _gtk_spin_button_new(long adjustment, double climb_rate, int digits); + public static final long gtk_spin_button_new(long adjustment, double climb_rate, int digits) { lock.lock(); try { return _gtk_spin_button_new(adjustment, climb_rate, digits); @@ -5800,8 +5800,8 @@ public class GTK extends OS { * @param spin_button cast=(GtkSpinButton*) * @param numeric cast=(gboolean) **/ - public static final native void _gtk_spin_button_set_numeric(long /*int*/ spin_button, boolean numeric); - public static final void gtk_spin_button_set_numeric(long /*int*/ spin_button, boolean numeric) { + public static final native void _gtk_spin_button_set_numeric(long spin_button, boolean numeric); + public static final void gtk_spin_button_set_numeric(long spin_button, boolean numeric) { lock.lock(); try { _gtk_spin_button_set_numeric(spin_button, numeric); @@ -5813,8 +5813,8 @@ public class GTK extends OS { * @param spin_button cast=(GtkSpinButton*) * @param adjustment cast=(GtkAdjustment *) **/ - public static final native void _gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits); - public static final void gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits) { + public static final native void _gtk_spin_button_configure(long spin_button, long adjustment, double climb_rate, int digits); + public static final void gtk_spin_button_configure(long spin_button, long adjustment, double climb_rate, int digits) { lock.lock(); try { _gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits); @@ -5823,8 +5823,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native long /*int*/ _gtk_spin_button_get_adjustment(long /*int*/ spin_button); - public static final long /*int*/ gtk_spin_button_get_adjustment(long /*int*/ spin_button) { + public static final native long _gtk_spin_button_get_adjustment(long spin_button); + public static final long gtk_spin_button_get_adjustment(long spin_button) { lock.lock(); try { return _gtk_spin_button_get_adjustment(spin_button); @@ -5833,8 +5833,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native int _gtk_spin_button_get_digits(long /*int*/ spin_button); - public static final int gtk_spin_button_get_digits(long /*int*/ spin_button) { + public static final native int _gtk_spin_button_get_digits(long spin_button); + public static final int gtk_spin_button_get_digits(long spin_button) { lock.lock(); try { return _gtk_spin_button_get_digits(spin_button); @@ -5843,8 +5843,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native void _gtk_spin_button_set_digits(long /*int*/ spin_button, int digits); - public static final void gtk_spin_button_set_digits(long /*int*/ spin_button, int digits) { + public static final native void _gtk_spin_button_set_digits(long spin_button, int digits); + public static final void gtk_spin_button_set_digits(long spin_button, int digits) { lock.lock(); try { _gtk_spin_button_set_digits(spin_button, digits); @@ -5853,8 +5853,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native void _gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page); - public static final void gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page) { + public static final native void _gtk_spin_button_set_increments(long spin_button, double step, double page); + public static final void gtk_spin_button_set_increments(long spin_button, double step, double page) { lock.lock(); try { _gtk_spin_button_set_increments(spin_button, step, page); @@ -5863,8 +5863,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native void _gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min); - public static final void gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min) { + public static final native void _gtk_spin_button_set_range(long spin_button, double max, double min); + public static final void gtk_spin_button_set_range(long spin_button, double max, double min) { lock.lock(); try { _gtk_spin_button_set_range(spin_button, max, min); @@ -5873,8 +5873,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native void _gtk_spin_button_set_value(long /*int*/ spin_button, double value); - public static final void gtk_spin_button_set_value(long /*int*/ spin_button, double value) { + public static final native void _gtk_spin_button_set_value(long spin_button, double value); + public static final void gtk_spin_button_set_value(long spin_button, double value) { lock.lock(); try { _gtk_spin_button_set_value(spin_button, value); @@ -5883,8 +5883,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native void _gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap); - public static final void gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap) { + public static final native void _gtk_spin_button_set_wrap(long spin_button, boolean wrap); + public static final void gtk_spin_button_set_wrap(long spin_button, boolean wrap) { lock.lock(); try { _gtk_spin_button_set_wrap(spin_button, wrap); @@ -5893,8 +5893,8 @@ public class GTK extends OS { } } /** @param spin_button cast=(GtkSpinButton*) */ - public static final native void _gtk_spin_button_update(long /*int*/ spin_button); - public static final void gtk_spin_button_update(long /*int*/ spin_button) { + public static final native void _gtk_spin_button_update(long spin_button); + public static final void gtk_spin_button_update(long spin_button) { lock.lock(); try { _gtk_spin_button_update(spin_button); @@ -5906,9 +5906,9 @@ public class GTK extends OS { * @param snapshot cast=(GtkSnapshot *) * @param rect cast=(const graphene_rect_t *) */ - public static final native long /*int*/ _gtk_snapshot_append_cairo(long /*int*/ snapshot, long /*int*/ rect); + public static final native long _gtk_snapshot_append_cairo(long snapshot, long rect); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_snapshot_append_cairo(long /*int*/ snapshot, long /*int*/ rect) { + public static final long gtk_snapshot_append_cairo(long snapshot, long rect) { lock.lock(); try { return _gtk_snapshot_append_cairo(snapshot, rect); @@ -5922,9 +5922,9 @@ public class GTK extends OS { * @param area cast=(GdkRectangle*) * @param orientation cast=(GtkOrientation*) */ - public static final native boolean _gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation); + public static final native boolean _gtk_status_icon_get_geometry(long handle, long screen, GdkRectangle area, long orientation); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation) { + public static final boolean gtk_status_icon_get_geometry(long handle, long screen, GdkRectangle area, long orientation) { lock.lock(); try { return _gtk_status_icon_get_geometry(handle, screen, area, orientation); @@ -5933,9 +5933,9 @@ public class GTK extends OS { } } /** @param handle cast=(GtkStatusIcon*) */ - public static final native boolean _gtk_status_icon_get_visible(long /*int*/ handle); + public static final native boolean _gtk_status_icon_get_visible(long handle); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gtk_status_icon_get_visible(long /*int*/ handle) { + public static final boolean gtk_status_icon_get_visible(long handle) { lock.lock(); try { return _gtk_status_icon_get_visible(handle); @@ -5943,9 +5943,9 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_status_icon_new(); + public static final native long _gtk_status_icon_new(); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_status_icon_new() { + public static final long gtk_status_icon_new() { lock.lock(); try { return _gtk_status_icon_new(); @@ -5957,9 +5957,9 @@ public class GTK extends OS { * @param handle cast=(GtkStatusIcon*) * @param pixbuf cast=(GdkPixbuf*) */ - public static final native void _gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf); + public static final native void _gtk_status_icon_set_from_pixbuf(long handle, long pixbuf); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf) { + public static final void gtk_status_icon_set_from_pixbuf(long handle, long pixbuf) { lock.lock(); try { _gtk_status_icon_set_from_pixbuf(handle, pixbuf); @@ -5971,9 +5971,9 @@ public class GTK extends OS { * @param handle cast=(GtkStatusIcon*) * @param visible cast=(gboolean) */ - public static final native void _gtk_status_icon_set_visible(long /*int*/ handle, boolean visible); + public static final native void _gtk_status_icon_set_visible(long handle, boolean visible); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_status_icon_set_visible(long /*int*/ handle, boolean visible) { + public static final void gtk_status_icon_set_visible(long handle, boolean visible) { lock.lock(); try { _gtk_status_icon_set_visible(handle, visible); @@ -5985,9 +5985,9 @@ public class GTK extends OS { * @param handle cast=(GtkStatusIcon *) * @param tip_text cast=(const gchar *) */ - public static final native void _gtk_status_icon_set_tooltip_text(long /*int*/ handle, byte[] tip_text); + public static final native void _gtk_status_icon_set_tooltip_text(long handle, byte[] tip_text); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_status_icon_set_tooltip_text(long /*int*/ handle, byte[] tip_text) { + public static final void gtk_status_icon_set_tooltip_text(long handle, byte[] tip_text) { lock.lock(); try { _gtk_status_icon_set_tooltip_text(handle, tip_text); @@ -5999,8 +5999,8 @@ public class GTK extends OS { * @param context cast=(GtkStyleContext *) * @param class_name cast=(const gchar *) */ - public static final native void _gtk_style_context_add_class(long /*int*/ context, byte[] class_name); - public static final void gtk_style_context_add_class(long /*int*/ context, byte[] class_name) { + public static final native void _gtk_style_context_add_class(long context, byte[] class_name); + public static final void gtk_style_context_add_class(long context, byte[] class_name) { lock.lock(); try { _gtk_style_context_add_class(context, class_name); @@ -6012,8 +6012,8 @@ public class GTK extends OS { * @param context cast=(GtkStyleContext *) * @param class_name cast=(const gchar *) */ - public static final native void _gtk_style_context_remove_class(long /*int*/ context, byte[] class_name); - public static final void gtk_style_context_remove_class(long /*int*/ context, byte[] class_name) { + public static final native void _gtk_style_context_remove_class(long context, byte[] class_name); + public static final void gtk_style_context_remove_class(long context, byte[] class_name) { lock.lock(); try { _gtk_style_context_remove_class(context, class_name); @@ -6022,9 +6022,9 @@ public class GTK extends OS { } } /** @method flags=dynamic */ - public static final native void _gtk_style_context_get_background_color(long /*int*/ context, int state, GdkRGBA color); + public static final native void _gtk_style_context_get_background_color(long context, int state, GdkRGBA color); /** [GTK3; 3.16 deprecated, replaced] */ - public static final void gtk_style_context_get_background_color(long /*int*/ context, int state, GdkRGBA color) { + public static final void gtk_style_context_get_background_color(long context, int state, GdkRGBA color) { lock.lock(); try { _gtk_style_context_get_background_color(context, state, color); @@ -6038,9 +6038,9 @@ public class GTK extends OS { * @param state cast=(GtkStateFlags) * @param color cast=(GdkRGBA *) */ - public static final native void _gtk_style_context_get_color(long /*int*/ context, int state, GdkRGBA color); + public static final native void _gtk_style_context_get_color(long context, int state, GdkRGBA color); /** [GTK3 only] */ - public static final void gtk_style_context_get_color(long /*int*/ context, int state, GdkRGBA color) { + public static final void gtk_style_context_get_color(long context, int state, GdkRGBA color) { lock.lock(); try { _gtk_style_context_get_color(context, state, color); @@ -6053,9 +6053,9 @@ public class GTK extends OS { * @param context cast=(GtkStyleContext *) * @param color cast=(GdkRGBA *) */ - public static final native void _gtk_style_context_get_color(long /*int*/ context, GdkRGBA color); + public static final native void _gtk_style_context_get_color(long context, GdkRGBA color); /** [GTK4 only] */ - public static final void gtk_style_context_get_color(long /*int*/ context, GdkRGBA color) { + public static final void gtk_style_context_get_color(long context, GdkRGBA color) { lock.lock(); try { _gtk_style_context_get_color(context, color); @@ -6064,9 +6064,9 @@ public class GTK extends OS { } } /** @method flags=dynamic */ - public static final native long /*int*/ _gtk_style_context_get_font(long /*int*/ context, int state); + public static final native long _gtk_style_context_get_font(long context, int state); /** [GTK3; 3.8 deprecated, replaced] */ - public static final long /*int*/ gtk_style_context_get_font(long /*int*/ context, int state) { + public static final long gtk_style_context_get_font(long context, int state) { lock.lock(); try { return _gtk_style_context_get_font(context, state); @@ -6080,9 +6080,9 @@ public class GTK extends OS { * @param state cast=(GtkStateFlags) * @param padding cast=(GtkBorder *),flags=no_in */ - public static final native void _gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder padding); + public static final native void _gtk_style_context_get_padding(long context, int state, GtkBorder padding); /** [GTK3 only] */ - public static final void gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder padding) { + public static final void gtk_style_context_get_padding(long context, int state, GtkBorder padding) { lock.lock(); try { _gtk_style_context_get_padding(context, state, padding); @@ -6095,9 +6095,9 @@ public class GTK extends OS { * @param context cast=(GtkStyleContext *) * @param padding cast=(GtkBorder *),flags=no_in */ - public static final native void _gtk_style_context_get_padding(long /*int*/ context, GtkBorder padding); + public static final native void _gtk_style_context_get_padding(long context, GtkBorder padding); /** [GTK4 only] */ - public static final void gtk_style_context_get_padding(long /*int*/ context, GtkBorder padding) { + public static final void gtk_style_context_get_padding(long context, GtkBorder padding) { lock.lock(); try { _gtk_style_context_get_padding(context, padding); @@ -6124,8 +6124,8 @@ public class GTK extends OS { * @param property cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ - public static final native void _gtk_style_context_get(long /*int*/ context, int state, byte [] property, long /*int*/ [] value, long /*int*/ terminator); - public static final void gtk_style_context_get(long /*int*/ context, int state, byte [] property, long /*int*/ [] value, long /*int*/ terminator) { + public static final native void _gtk_style_context_get(long context, int state, byte [] property, long [] value, long terminator); + public static final void gtk_style_context_get(long context, int state, byte [] property, long [] value, long terminator) { lock.lock(); try { _gtk_style_context_get(context, state, property, value, terminator); @@ -6138,8 +6138,8 @@ public class GTK extends OS { * @param property cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ - public static final native void _gtk_style_context_get(long /*int*/ context, byte [] property, long /*int*/ [] value, long /*int*/ terminator); - public static final void gtk_style_context_get(long /*int*/ context, byte [] property, long /*int*/ [] value, long /*int*/ terminator) { + public static final native void _gtk_style_context_get(long context, byte [] property, long [] value, long terminator); + public static final void gtk_style_context_get(long context, byte [] property, long [] value, long terminator) { lock.lock(); try { _gtk_style_context_get(context, property, value, terminator); @@ -6153,9 +6153,9 @@ public class GTK extends OS { * @param state cast=(GtkStateFlags) * @param padding cast=(GtkBorder *),flags=no_in */ - public static final native void _gtk_style_context_get_border(long /*int*/ context, int state, GtkBorder padding); + public static final native void _gtk_style_context_get_border(long context, int state, GtkBorder padding); /** [GTK3 only] */ - public static final void gtk_style_context_get_border(long /*int*/ context, int state, GtkBorder padding) { + public static final void gtk_style_context_get_border(long context, int state, GtkBorder padding) { lock.lock(); try { _gtk_style_context_get_border(context, state, padding); @@ -6168,9 +6168,9 @@ public class GTK extends OS { * @param context cast=(GtkStyleContext *) * @param padding cast=(GtkBorder *),flags=no_in */ - public static final native void _gtk_style_context_get_border(long /*int*/ context, GtkBorder padding); + public static final native void _gtk_style_context_get_border(long context, GtkBorder padding); /** [GTK4 only] */ - public static final void gtk_style_context_get_border(long /*int*/ context, GtkBorder padding) { + public static final void gtk_style_context_get_border(long context, GtkBorder padding) { lock.lock(); try { _gtk_style_context_get_border(context, padding); @@ -6179,9 +6179,9 @@ public class GTK extends OS { } } /** @method flags=dynamic */ - public static final native void _gtk_style_context_invalidate(long /*int*/ context); + public static final native void _gtk_style_context_invalidate(long context); /** [GTK3; 3.12 deprecated] */ - public static final void gtk_style_context_invalidate(long /*int*/ context) { + public static final void gtk_style_context_invalidate(long context) { lock.lock(); try { _gtk_style_context_invalidate(context); @@ -6192,8 +6192,8 @@ public class GTK extends OS { /** * @param self cast=(GtkStyleContext *) */ - public static final native void _gtk_style_context_save(long /*int*/ self); - public static final void gtk_style_context_save(long /*int*/ self) { + public static final native void _gtk_style_context_save(long self); + public static final void gtk_style_context_save(long self) { lock.lock(); try { _gtk_style_context_save(self); @@ -6204,8 +6204,8 @@ public class GTK extends OS { /** * @param context cast=(GtkStyleContext *) */ - public static final native void _gtk_style_context_restore(long /*int*/ context); - public static final void gtk_style_context_restore(long /*int*/ context) { + public static final native void _gtk_style_context_restore(long context); + public static final void gtk_style_context_restore(long context) { lock.lock(); try { _gtk_style_context_restore(context); @@ -6216,8 +6216,8 @@ public class GTK extends OS { /** * @param self cast=(GtkWidget *) */ - public static final native int _gtk_widget_get_state_flags(long /*int*/ self); - public static final int gtk_widget_get_state_flags(long /*int*/ self) { + public static final native int _gtk_widget_get_state_flags(long self); + public static final int gtk_widget_get_state_flags(long self) { lock.lock(); try { return _gtk_widget_get_state_flags(self); @@ -6229,8 +6229,8 @@ public class GTK extends OS { * @param context cast=(GtkStyleContext *) * @param flags cast=(GtkStateFlags) */ - public static final native void _gtk_style_context_set_state(long /*int*/ context, long /*int*/ flags); - public static final void gtk_style_context_set_state(long /*int*/ context, long /*int*/ flags) { + public static final native void _gtk_style_context_set_state(long context, long flags); + public static final void gtk_style_context_set_state(long context, long flags) { lock.lock(); try { _gtk_style_context_set_state(context,flags); @@ -6242,9 +6242,9 @@ public class GTK extends OS { * @param targets cast=(const GtkTargetEntry *) * @param ntargets cast=(guint) */ - public static final native long /*int*/ _gtk_target_list_new(long /*int*/ targets, int ntargets); + public static final native long _gtk_target_list_new(long targets, int ntargets); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_target_list_new(long /*int*/ targets, int ntargets) { + public static final long gtk_target_list_new(long targets, int ntargets) { lock.lock(); try { return _gtk_target_list_new(targets, ntargets); @@ -6253,9 +6253,9 @@ public class GTK extends OS { } } /** @param list cast=(GtkTargetList *) */ - public static final native void _gtk_target_list_unref(long /*int*/ list); + public static final native void _gtk_target_list_unref(long list); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_target_list_unref(long /*int*/ list) { + public static final void gtk_target_list_unref(long list) { lock.lock(); try { _gtk_target_list_unref(list); @@ -6267,9 +6267,9 @@ public class GTK extends OS { * @method flags=dynamic * @param buffer cast=(GtkTextBuffer *) */ - public static final native void _gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard); + public static final native void _gtk_text_buffer_copy_clipboard(long buffer, long clipboard); /** [GTK3/GTK4, GTK3 uses GtkClipboard but GTK4 uses GdkClipboard -- method signature otherwise identical] */ - public static final void gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard) { + public static final void gtk_text_buffer_copy_clipboard(long buffer, long clipboard) { lock.lock(); try { _gtk_text_buffer_copy_clipboard(buffer, clipboard); @@ -6283,8 +6283,8 @@ public class GTK extends OS { * @param where cast=(GtkTextIter *) * @param left_gravity cast=(gboolean) */ - public static final native long /*int*/ _gtk_text_buffer_create_mark(long /*int*/ buffer, byte [] mark_name, byte [] where, boolean left_gravity); - public static final long /*int*/ gtk_text_buffer_create_mark(long /*int*/ buffer, byte [] mark_name, byte [] where, boolean left_gravity) { + public static final native long _gtk_text_buffer_create_mark(long buffer, byte [] mark_name, byte [] where, boolean left_gravity); + public static final long gtk_text_buffer_create_mark(long buffer, byte [] mark_name, byte [] where, boolean left_gravity) { lock.lock(); try { return _gtk_text_buffer_create_mark(buffer, mark_name, where, left_gravity); @@ -6297,9 +6297,9 @@ public class GTK extends OS { * @param buffer cast=(GtkTextBuffer *) * @param default_editable cast=(gboolean) */ - public static final native void _gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable); + public static final native void _gtk_text_buffer_cut_clipboard(long buffer, long clipboard, boolean default_editable); /** [GTK3/GTK4, GTK3 uses GtkClipboard but GTK4 uses GdkClipboard -- method signature otherwise identical] */ - public static final void gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable) { + public static final void gtk_text_buffer_cut_clipboard(long buffer, long clipboard, boolean default_editable) { lock.lock(); try { _gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable); @@ -6312,8 +6312,8 @@ public class GTK extends OS { * @param start cast=(GtkTextIter *) * @param end cast=(GtkTextIter *) */ - public static final native void _gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end); - public static final void gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end) { + public static final native void _gtk_text_buffer_delete(long buffer, byte[] start, byte[] end); + public static final void gtk_text_buffer_delete(long buffer, byte[] start, byte[] end) { lock.lock(); try { _gtk_text_buffer_delete(buffer, start, end); @@ -6326,8 +6326,8 @@ public class GTK extends OS { * @param start cast=(GtkTextIter *) * @param end cast=(GtkTextIter *) */ - public static final native void _gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end); - public static final void gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end) { + public static final native void _gtk_text_buffer_get_bounds(long buffer, byte[] start, byte[] end); + public static final void gtk_text_buffer_get_bounds(long buffer, byte[] start, byte[] end) { lock.lock(); try { _gtk_text_buffer_get_bounds(buffer, start, end); @@ -6339,8 +6339,8 @@ public class GTK extends OS { * @param buffer cast=(GtkTextBuffer *) * @param iter cast=(GtkTextIter *) */ - public static final native void _gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter); - public static final void gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter) { + public static final native void _gtk_text_buffer_get_end_iter(long buffer, byte[] iter); + public static final void gtk_text_buffer_get_end_iter(long buffer, byte[] iter) { lock.lock(); try { _gtk_text_buffer_get_end_iter(buffer, iter); @@ -6349,8 +6349,8 @@ public class GTK extends OS { } } /** @param buffer cast=(GtkTextBuffer *) */ - public static final native long /*int*/ _gtk_text_buffer_get_insert(long /*int*/ buffer); - public static final long /*int*/ gtk_text_buffer_get_insert(long /*int*/ buffer) { + public static final native long _gtk_text_buffer_get_insert(long buffer); + public static final long gtk_text_buffer_get_insert(long buffer) { lock.lock(); try { return _gtk_text_buffer_get_insert(buffer); @@ -6363,8 +6363,8 @@ public class GTK extends OS { * @param iter cast=(GtkTextIter *) * @param line_number cast=(gint) */ - public static final native void _gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number); - public static final void gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number) { + public static final native void _gtk_text_buffer_get_iter_at_line(long buffer, byte[] iter, int line_number); + public static final void gtk_text_buffer_get_iter_at_line(long buffer, byte[] iter, int line_number) { lock.lock(); try { _gtk_text_buffer_get_iter_at_line(buffer, iter, line_number); @@ -6377,8 +6377,8 @@ public class GTK extends OS { * @param iter cast=(GtkTextIter *) * @param mark cast=(GtkTextMark *) */ - public static final native void _gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark); - public static final void gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark) { + public static final native void _gtk_text_buffer_get_iter_at_mark(long buffer, byte[] iter, long mark); + public static final void gtk_text_buffer_get_iter_at_mark(long buffer, byte[] iter, long mark) { lock.lock(); try { _gtk_text_buffer_get_iter_at_mark(buffer, iter, mark); @@ -6391,8 +6391,8 @@ public class GTK extends OS { * @param iter cast=(GtkTextIter *) * @param char_offset cast=(gint) */ - public static final native void _gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset); - public static final void gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset) { + public static final native void _gtk_text_buffer_get_iter_at_offset(long buffer, byte[] iter, int char_offset); + public static final void gtk_text_buffer_get_iter_at_offset(long buffer, byte[] iter, int char_offset) { lock.lock(); try { _gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset); @@ -6401,8 +6401,8 @@ public class GTK extends OS { } } /** @param buffer cast=(GtkTextBuffer *) */ - public static final native int _gtk_text_buffer_get_line_count(long /*int*/ buffer); - public static final int gtk_text_buffer_get_line_count(long /*int*/ buffer) { + public static final native int _gtk_text_buffer_get_line_count(long buffer); + public static final int gtk_text_buffer_get_line_count(long buffer) { lock.lock(); try { return _gtk_text_buffer_get_line_count(buffer); @@ -6411,8 +6411,8 @@ public class GTK extends OS { } } /** @param buffer cast=(GtkTextBuffer *) */ - public static final native long /*int*/ _gtk_text_buffer_get_selection_bound(long /*int*/ buffer); - public static final long /*int*/ gtk_text_buffer_get_selection_bound(long /*int*/ buffer) { + public static final native long _gtk_text_buffer_get_selection_bound(long buffer); + public static final long gtk_text_buffer_get_selection_bound(long buffer) { lock.lock(); try { return _gtk_text_buffer_get_selection_bound(buffer); @@ -6425,8 +6425,8 @@ public class GTK extends OS { * @param start cast=(GtkTextIter *) * @param end cast=(GtkTextIter *) */ - public static final native boolean _gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end); - public static final boolean gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end) { + public static final native boolean _gtk_text_buffer_get_selection_bounds(long buffer, byte[] start, byte[] end); + public static final boolean gtk_text_buffer_get_selection_bounds(long buffer, byte[] start, byte[] end) { lock.lock(); try { return _gtk_text_buffer_get_selection_bounds(buffer, start, end); @@ -6440,8 +6440,8 @@ public class GTK extends OS { * @param end cast=(GtkTextIter *) * @param include_hidden_chars cast=(gboolean) */ - public static final native long /*int*/ _gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars); - public static final long /*int*/ gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) { + public static final native long _gtk_text_buffer_get_text(long buffer, byte[] start, byte[] end, boolean include_hidden_chars); + public static final long gtk_text_buffer_get_text(long buffer, byte[] start, byte[] end, boolean include_hidden_chars) { lock.lock(); try { return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars); @@ -6455,8 +6455,8 @@ public class GTK extends OS { * @param text cast=(const gchar *) * @param len cast=(gint) */ - public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len); - public static final void gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len) { + public static final native void _gtk_text_buffer_insert(long buffer, byte[] iter, byte[] text, int len); + public static final void gtk_text_buffer_insert(long buffer, byte[] iter, byte[] text, int len) { lock.lock(); try { _gtk_text_buffer_insert(buffer, iter, text, len); @@ -6470,8 +6470,8 @@ public class GTK extends OS { * @param text cast=(const gchar *) * @param len cast=(gint) */ - public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len); - public static final void gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len) { + public static final native void _gtk_text_buffer_insert(long buffer, long iter, byte[] text, int len); + public static final void gtk_text_buffer_insert(long buffer, long iter, byte[] text, int len) { lock.lock(); try { _gtk_text_buffer_insert(buffer, iter, text, len); @@ -6484,8 +6484,8 @@ public class GTK extends OS { * @param ins cast=(const GtkTextIter *) * @param bound cast=(const GtkTextIter *) */ - public static final native void _gtk_text_buffer_select_range (long /*int*/ buffer, byte[] ins, byte[] bound); - public static final void gtk_text_buffer_select_range (long /*int*/ buffer, byte[] ins, byte[] bound) { + public static final native void _gtk_text_buffer_select_range (long buffer, byte[] ins, byte[] bound); + public static final void gtk_text_buffer_select_range (long buffer, byte[] ins, byte[] bound) { lock.lock(); try { _gtk_text_buffer_select_range(buffer, ins, bound); @@ -6499,9 +6499,9 @@ public class GTK extends OS { * @param override_location cast=(GtkTextIter *) * @param default_editable cast=(gboolean) */ - public static final native void _gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable); + public static final native void _gtk_text_buffer_paste_clipboard(long buffer, long clipboard, byte[] override_location, boolean default_editable); /** [GTK3/GTK4, GTK3 uses GtkClipboard but GTK4 uses GdkClipboard -- method signature otherwise identical] */ - public static final void gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable) { + public static final void gtk_text_buffer_paste_clipboard(long buffer, long clipboard, byte[] override_location, boolean default_editable) { lock.lock(); try { _gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable); @@ -6513,8 +6513,8 @@ public class GTK extends OS { * @param buffer cast=(GtkTextBuffer *) * @param where cast=(const GtkTextIter *) */ - public static final native void _gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where); - public static final void gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where) { + public static final native void _gtk_text_buffer_place_cursor(long buffer, byte[] where); + public static final void gtk_text_buffer_place_cursor(long buffer, byte[] where) { lock.lock(); try { _gtk_text_buffer_place_cursor(buffer, where); @@ -6527,8 +6527,8 @@ public class GTK extends OS { * @param text cast=(const gchar *) * @param len cast=(gint) */ - public static final native void _gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len); - public static final void gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len) { + public static final native void _gtk_text_buffer_set_text(long buffer, byte[] text, int len); + public static final void gtk_text_buffer_set_text(long buffer, byte[] text, int len) { lock.lock(); try { _gtk_text_buffer_set_text(buffer, text, len); @@ -6565,9 +6565,9 @@ public class GTK extends OS { * @param window_x cast=(gint *) * @param window_y cast=(gint *) */ - public static final native void _gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y); + public static final native void _gtk_text_view_buffer_to_window_coords(long text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y); /** [GTK3 only] */ - public static final void gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) { + public static final void gtk_text_view_buffer_to_window_coords(long text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) { lock.lock(); try { _gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y); @@ -6584,9 +6584,9 @@ public class GTK extends OS { * @param window_x cast=(gint *) * @param window_y cast=(gint *) */ - public static final native void _gtk_text_view_buffer_to_surface_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y); + public static final native void _gtk_text_view_buffer_to_surface_coords(long text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y); /** [GTK4 only] */ - public static final void gtk_text_view_buffer_to_surface_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) { + public static final void gtk_text_view_buffer_to_surface_coords(long text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) { lock.lock(); try { _gtk_text_view_buffer_to_surface_coords(text_view, win, buffer_x, buffer_y, window_x, window_y); @@ -6595,8 +6595,8 @@ public class GTK extends OS { } } /** @param text_view cast=(GtkTextView *) */ - public static final native long /*int*/ _gtk_text_view_get_buffer(long /*int*/ text_view); - public static final long /*int*/ gtk_text_view_get_buffer(long /*int*/ text_view) { + public static final native long _gtk_text_view_get_buffer(long text_view); + public static final long gtk_text_view_get_buffer(long text_view) { lock.lock(); try { return _gtk_text_view_get_buffer(text_view); @@ -6605,8 +6605,8 @@ public class GTK extends OS { } } /** @param text_view cast=(GtkTextView *) */ - public static final native boolean _gtk_text_view_get_editable(long /*int*/ text_view); - public static final boolean gtk_text_view_get_editable(long /*int*/ text_view) { + public static final native boolean _gtk_text_view_get_editable(long text_view); + public static final boolean gtk_text_view_get_editable(long text_view) { lock.lock(); try { return _gtk_text_view_get_editable(text_view); @@ -6620,8 +6620,8 @@ public class GTK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native void _gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y); - public static final void gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y) { + public static final native void _gtk_text_view_get_iter_at_location(long text_view, byte[] iter, int x, int y); + public static final void gtk_text_view_get_iter_at_location(long text_view, byte[] iter, int x, int y) { lock.lock(); try { _gtk_text_view_get_iter_at_location(text_view, iter, x, y); @@ -6634,8 +6634,8 @@ public class GTK extends OS { * @param iter cast=(const GtkTextIter *) * @param location cast=(GdkRectangle *),flags=no_in */ - public static final native void _gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location); - public static final void gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location) { + public static final native void _gtk_text_view_get_iter_location(long text_view, byte[] iter, GdkRectangle location); + public static final void gtk_text_view_get_iter_location(long text_view, byte[] iter, GdkRectangle location) { lock.lock(); try { _gtk_text_view_get_iter_location(text_view, iter, location); @@ -6649,8 +6649,8 @@ public class GTK extends OS { * @param y cast=(gint) * @param line_top cast=(gint *) */ - public static final native void _gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top); - public static final void gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top) { + public static final native void _gtk_text_view_get_line_at_y(long text_view, byte[] target_iter, int y, int[] line_top); + public static final void gtk_text_view_get_line_at_y(long text_view, byte[] target_iter, int y, int[] line_top) { lock.lock(); try { _gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top); @@ -6664,8 +6664,8 @@ public class GTK extends OS { * @param y cast=(gint *) * @param height cast=(gint *) */ - public static final native void _gtk_text_view_get_line_yrange(long /*int*/ text_view, byte[] target_iter, int[] y, int[] height); - public static final void gtk_text_view_get_line_yrange(long /*int*/ text_view, byte[] target_iter, int[] y, int[] height) { + public static final native void _gtk_text_view_get_line_yrange(long text_view, byte[] target_iter, int[] y, int[] height); + public static final void gtk_text_view_get_line_yrange(long text_view, byte[] target_iter, int[] y, int[] height) { lock.lock(); try { _gtk_text_view_get_line_yrange(text_view, target_iter, y, height); @@ -6677,8 +6677,8 @@ public class GTK extends OS { * @param text_view cast=(GtkTextView *) * @param visible_rect cast=(GdkRectangle *),flags=no_in */ - public static final native void _gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect); - public static final void gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect) { + public static final native void _gtk_text_view_get_visible_rect(long text_view, GdkRectangle visible_rect); + public static final void gtk_text_view_get_visible_rect(long text_view, GdkRectangle visible_rect) { lock.lock(); try { _gtk_text_view_get_visible_rect(text_view, visible_rect); @@ -6690,9 +6690,9 @@ public class GTK extends OS { * @param text_view cast=(GtkTextView *) * @param win cast=(GtkTextWindowType) */ - public static final native long /*int*/ _gtk_text_view_get_window(long /*int*/ text_view, int win); + public static final native long _gtk_text_view_get_window(long text_view, int win); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_text_view_get_window(long /*int*/ text_view, int win) { + public static final long gtk_text_view_get_window(long text_view, int win) { lock.lock(); try { return _gtk_text_view_get_window(text_view, win); @@ -6700,8 +6700,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_text_view_new(); - public static final long /*int*/ gtk_text_view_new() { + public static final native long _gtk_text_view_new(); + public static final long gtk_text_view_new() { lock.lock(); try { return _gtk_text_view_new(); @@ -6717,8 +6717,8 @@ public class GTK extends OS { * @param xalign cast=(gdouble) * @param yalign cast=(gdouble) */ - public static final native void _gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign); - public static final void gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign) { + public static final native void _gtk_text_view_scroll_to_mark(long text_view, long mark, double within_margin, boolean use_align, double xalign, double yalign); + public static final void gtk_text_view_scroll_to_mark(long text_view, long mark, double within_margin, boolean use_align, double xalign, double yalign) { lock.lock(); try { _gtk_text_view_scroll_to_mark(text_view, mark, within_margin, use_align, xalign, yalign); @@ -6734,8 +6734,8 @@ public class GTK extends OS { * @param xalign cast=(gdouble) * @param yalign cast=(gdouble) */ - public static final native boolean _gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign); - public static final boolean gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) { + public static final native boolean _gtk_text_view_scroll_to_iter(long text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign); + public static final boolean gtk_text_view_scroll_to_iter(long text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) { lock.lock(); try { return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign); @@ -6747,8 +6747,8 @@ public class GTK extends OS { * @param text_view cast=(GtkTextView *) * @param setting cast=(gboolean) */ - public static final native void _gtk_text_view_set_editable(long /*int*/ text_view, boolean setting); - public static final void gtk_text_view_set_editable(long /*int*/ text_view, boolean setting) { + public static final native void _gtk_text_view_set_editable(long text_view, boolean setting); + public static final void gtk_text_view_set_editable(long text_view, boolean setting) { lock.lock(); try { _gtk_text_view_set_editable(text_view, setting); @@ -6757,8 +6757,8 @@ public class GTK extends OS { } } /** @param text_view cast=(GtkTextView *) */ - public static final native void _gtk_text_view_set_justification(long /*int*/ text_view, int justification); - public static final void gtk_text_view_set_justification(long /*int*/ text_view, int justification) { + public static final native void _gtk_text_view_set_justification(long text_view, int justification); + public static final void gtk_text_view_set_justification(long text_view, int justification) { lock.lock(); try { _gtk_text_view_set_justification(text_view, justification); @@ -6770,8 +6770,8 @@ public class GTK extends OS { * @param text_view cast=(GtkTextView *) * @param tabs cast=(PangoTabArray *) */ - public static final native void _gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs); - public static final void gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs) { + public static final native void _gtk_text_view_set_tabs(long text_view, long tabs); + public static final void gtk_text_view_set_tabs(long text_view, long tabs) { lock.lock(); try { _gtk_text_view_set_tabs(text_view, tabs); @@ -6780,8 +6780,8 @@ public class GTK extends OS { } } /** @param text_view cast=(GtkTextView *) */ - public static final native void _gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode); - public static final void gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode) { + public static final native void _gtk_text_view_set_wrap_mode(long text_view, int wrap_mode); + public static final void gtk_text_view_set_wrap_mode(long text_view, int wrap_mode) { lock.lock(); try { _gtk_text_view_set_wrap_mode(text_view, wrap_mode); @@ -6790,8 +6790,8 @@ public class GTK extends OS { } } /** @param toggle_button cast=(GtkToggleButton *) */ - public static final native boolean _gtk_toggle_button_get_active(long /*int*/ toggle_button); - public static final boolean gtk_toggle_button_get_active(long /*int*/ toggle_button) { + public static final native boolean _gtk_toggle_button_get_active(long toggle_button); + public static final boolean gtk_toggle_button_get_active(long toggle_button) { lock.lock(); try { return _gtk_toggle_button_get_active(toggle_button); @@ -6799,8 +6799,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_toggle_button_new(); - public static final long /*int*/ gtk_toggle_button_new() { + public static final native long _gtk_toggle_button_new(); + public static final long gtk_toggle_button_new() { lock.lock(); try { return _gtk_toggle_button_new(); @@ -6812,8 +6812,8 @@ public class GTK extends OS { * @param toggle_button cast=(GtkToggleButton *) * @param is_active cast=(gboolean) */ - public static final native void _gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active); - public static final void gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active) { + public static final native void _gtk_toggle_button_set_active(long toggle_button, boolean is_active); + public static final void gtk_toggle_button_set_active(long toggle_button, boolean is_active) { lock.lock(); try { _gtk_toggle_button_set_active(toggle_button, is_active); @@ -6826,9 +6826,9 @@ public class GTK extends OS { * @param toggle_button cast=(GtkToggleButton *) * @param setting cast=(gboolean) */ - public static final native void _gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting); + public static final native void _gtk_toggle_button_set_inconsistent(long toggle_button, boolean setting); /** [GTK3 only] */ - public static final void gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting) { + public static final void gtk_toggle_button_set_inconsistent(long toggle_button, boolean setting) { lock.lock(); try { _gtk_toggle_button_set_inconsistent(toggle_button, setting); @@ -6841,9 +6841,9 @@ public class GTK extends OS { * @param toggle_button cast=(GtkToggleButton *) * @param draw_indicator cast=(gboolean) */ - public static final native void _gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator); + public static final native void _gtk_toggle_button_set_mode(long toggle_button, boolean draw_indicator); /** [GTK3 only] */ - public static final void gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator) { + public static final void gtk_toggle_button_set_mode(long toggle_button, boolean draw_indicator) { lock.lock(); try { _gtk_toggle_button_set_mode(toggle_button, draw_indicator); @@ -6852,8 +6852,8 @@ public class GTK extends OS { } } /** @param button cast=(GtkToggleToolButton *) */ - public static final native boolean _gtk_toggle_tool_button_get_active(long /*int*/ button); - public static final boolean gtk_toggle_tool_button_get_active(long /*int*/ button) { + public static final native boolean _gtk_toggle_tool_button_get_active(long button); + public static final boolean gtk_toggle_tool_button_get_active(long button) { lock.lock(); try { return _gtk_toggle_tool_button_get_active(button); @@ -6861,8 +6861,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_toggle_tool_button_new(); - public static final long /*int*/ gtk_toggle_tool_button_new() { + public static final native long _gtk_toggle_tool_button_new(); + public static final long gtk_toggle_tool_button_new() { lock.lock(); try { return _gtk_toggle_tool_button_new(); @@ -6874,8 +6874,8 @@ public class GTK extends OS { * @param item cast=(GtkToggleToolButton *) * @param selected cast=(gboolean) */ - public static final native void _gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected); - public static final void gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected) { + public static final native void _gtk_toggle_tool_button_set_active(long item, boolean selected); + public static final void gtk_toggle_tool_button_set_active(long item, boolean selected) { lock.lock(); try { _gtk_toggle_tool_button_set_active(item, selected); @@ -6887,8 +6887,8 @@ public class GTK extends OS { * @param icon_widget cast=(GtkWidget *) * @param label cast=(const gchar *) */ - public static final native long /*int*/ _gtk_tool_button_new(long /*int*/ icon_widget, byte[] label); - public static final long /*int*/ gtk_tool_button_new(long /*int*/ icon_widget, byte[] label) { + public static final native long _gtk_tool_button_new(long icon_widget, byte[] label); + public static final long gtk_tool_button_new(long icon_widget, byte[] label) { lock.lock(); try { return _gtk_tool_button_new(icon_widget, label); @@ -6900,8 +6900,8 @@ public class GTK extends OS { * @param button cast=(GtkToolButton *) * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget); - public static final void gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget) { + public static final native void _gtk_tool_button_set_icon_widget(long button, long widget); + public static final void gtk_tool_button_set_icon_widget(long button, long widget) { lock.lock(); try { _gtk_tool_button_set_icon_widget(button, widget); @@ -6913,8 +6913,8 @@ public class GTK extends OS { * @param button cast=(GtkToolButton *) * @param label cast=(const gchar *) */ - public static final native void _gtk_tool_button_set_label(long /*int*/ button, byte[] label); - public static final void gtk_tool_button_set_label(long /*int*/ button, byte[] label) { + public static final native void _gtk_tool_button_set_label(long button, byte[] label); + public static final void gtk_tool_button_set_label(long button, byte[] label) { lock.lock(); try { _gtk_tool_button_set_label(button, label); @@ -6926,8 +6926,8 @@ public class GTK extends OS { * @param button cast=(GtkToolButton *) * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_tool_button_set_label_widget(long /*int*/ button, long /*int*/ widget); - public static final void gtk_tool_button_set_label_widget(long /*int*/ button, long /*int*/ widget) { + public static final native void _gtk_tool_button_set_label_widget(long button, long widget); + public static final void gtk_tool_button_set_label_widget(long button, long widget) { lock.lock(); try { _gtk_tool_button_set_label_widget(button, widget); @@ -6939,8 +6939,8 @@ public class GTK extends OS { * @param item cast=(GtkToolButton *) * @param underline cast=(gboolean) */ - public static final native void _gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline); - public static final void gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline) { + public static final native void _gtk_tool_button_set_use_underline(long item, boolean underline); + public static final void gtk_tool_button_set_use_underline(long item, boolean underline) { lock.lock(); try { _gtk_tool_button_set_use_underline(item, underline); @@ -6952,8 +6952,8 @@ public class GTK extends OS { * @param item cast=(GtkToolItem *) * @param menu_id cast=(const gchar *) */ - public static final native long /*int*/ _gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id); - public static final long /*int*/ gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id) { + public static final native long _gtk_tool_item_get_proxy_menu_item(long item, byte[] menu_id); + public static final long gtk_tool_item_get_proxy_menu_item(long item, byte[] menu_id) { lock.lock(); try { return _gtk_tool_item_get_proxy_menu_item(item, menu_id); @@ -6962,8 +6962,8 @@ public class GTK extends OS { } } /** @param item cast=(GtkToolItem *) */ - public static final native long /*int*/ _gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item); - public static final long /*int*/ gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item) { + public static final native long _gtk_tool_item_retrieve_proxy_menu_item(long item); + public static final long gtk_tool_item_retrieve_proxy_menu_item(long item) { lock.lock(); try { return _gtk_tool_item_retrieve_proxy_menu_item(item); @@ -6975,8 +6975,8 @@ public class GTK extends OS { * @param item cast=(GtkToolItem *) * @param important cast=(gboolean) */ - public static final native void _gtk_tool_item_set_is_important(long /*int*/ item, boolean important); - public static final void gtk_tool_item_set_is_important(long /*int*/ item, boolean important) { + public static final native void _gtk_tool_item_set_is_important(long item, boolean important); + public static final void gtk_tool_item_set_is_important(long item, boolean important) { lock.lock(); try { _gtk_tool_item_set_is_important(item, important); @@ -6989,8 +6989,8 @@ public class GTK extends OS { * @param menu_id cast=(const gchar *) * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget); - public static final void gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget) { + public static final native void _gtk_tool_item_set_proxy_menu_item(long item, byte[] menu_id, long widget); + public static final void gtk_tool_item_set_proxy_menu_item(long item, byte[] menu_id, long widget) { lock.lock(); try { _gtk_tool_item_set_proxy_menu_item(item, menu_id, widget); @@ -7002,8 +7002,8 @@ public class GTK extends OS { * @param toolbar cast=(GtkToolbar *) * @param item cast=(GtkToolItem *) */ - public static final native void _gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos); - public static final void gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos) { + public static final native void _gtk_toolbar_insert(long toolbar, long item, int pos); + public static final void gtk_toolbar_insert(long toolbar, long item, int pos) { lock.lock(); try { _gtk_toolbar_insert(toolbar, item, pos); @@ -7011,8 +7011,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_toolbar_new(); - public static final long /*int*/ gtk_toolbar_new() { + public static final native long _gtk_toolbar_new(); + public static final long gtk_toolbar_new() { lock.lock(); try { return _gtk_toolbar_new(); @@ -7024,8 +7024,8 @@ public class GTK extends OS { * @param toolbar cast=(GtkToolbar *) * @param show_arrow cast=(gboolean) */ - public static final native void _gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow); - public static final void gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow) { + public static final native void _gtk_toolbar_set_show_arrow(long toolbar, boolean show_arrow); + public static final void gtk_toolbar_set_show_arrow(long toolbar, boolean show_arrow) { lock.lock(); try { _gtk_toolbar_set_show_arrow(toolbar, show_arrow); @@ -7036,8 +7036,8 @@ public class GTK extends OS { /** @param toolbar cast=(GtkToolbar *) * @param style cast=(GtkToolbarStyle) */ - public static final native void _gtk_toolbar_set_style(long /*int*/ toolbar, int style); - public static final void gtk_toolbar_set_style(long /*int*/ toolbar, int style) { + public static final native void _gtk_toolbar_set_style(long toolbar, int style); + public static final void gtk_toolbar_set_style(long toolbar, int style) { lock.lock(); try { _gtk_toolbar_set_style(toolbar, style); @@ -7049,9 +7049,9 @@ public class GTK extends OS { * @method flags=dynamic * @param toolbar cast=(GtkToolbar *) */ - public static final native void _gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size); + public static final native void _gtk_toolbar_set_icon_size(long toolbar, int size); /** [GTK3 only] */ - public static final void gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size) { + public static final void gtk_toolbar_set_icon_size(long toolbar, int size) { lock.lock(); try { _gtk_toolbar_set_icon_size(toolbar, size); @@ -7063,8 +7063,8 @@ public class GTK extends OS { * @param tree_model cast=(GtkTreeModel *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator); - public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator) { + public static final native void _gtk_tree_model_get(long tree_model, long iter, int column, long[] value, int terminator); + public static final void gtk_tree_model_get(long tree_model, long iter, int column, long[] value, int terminator) { lock.lock(); try { _gtk_tree_model_get(tree_model, iter, column, value, terminator); @@ -7076,8 +7076,8 @@ public class GTK extends OS { * @param tree_model cast=(GtkTreeModel *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator); - public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator) { + public static final native void _gtk_tree_model_get(long tree_model, long iter, int column, int[] value, int terminator); + public static final void gtk_tree_model_get(long tree_model, long iter, int column, int[] value, int terminator) { lock.lock(); try { _gtk_tree_model_get(tree_model, iter, column, value, terminator); @@ -7090,8 +7090,8 @@ public class GTK extends OS { * @param iter cast=(GtkTreeIter *) * @param path cast=(GtkTreePath *) */ - public static final native boolean _gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path); - public static final boolean gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path) { + public static final native boolean _gtk_tree_model_get_iter(long tree_model, long iter, long path); + public static final boolean gtk_tree_model_get_iter(long tree_model, long iter, long path) { lock.lock(); try { return _gtk_tree_model_get_iter(tree_model, iter, path); @@ -7103,8 +7103,8 @@ public class GTK extends OS { * @param tree_model cast=(GtkTreeModel *) * @param iter cast=(GtkTreeIter *) */ - public static final native boolean _gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter); - public static final boolean gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter) { + public static final native boolean _gtk_tree_model_get_iter_first(long tree_model, long iter); + public static final boolean gtk_tree_model_get_iter_first(long tree_model, long iter) { lock.lock(); try { return _gtk_tree_model_get_iter_first(tree_model, iter); @@ -7113,8 +7113,8 @@ public class GTK extends OS { } } /** @param tree_model cast=(GtkTreeModel *) */ - public static final native int _gtk_tree_model_get_n_columns(long /*int*/ tree_model); - public static final int gtk_tree_model_get_n_columns(long /*int*/ tree_model) { + public static final native int _gtk_tree_model_get_n_columns(long tree_model); + public static final int gtk_tree_model_get_n_columns(long tree_model) { lock.lock(); try { return _gtk_tree_model_get_n_columns(tree_model); @@ -7126,8 +7126,8 @@ public class GTK extends OS { * @param tree_model cast=(GtkTreeModel *) * @param iter cast=(GtkTreeIter *) */ - public static final native long /*int*/ _gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter); - public static final long /*int*/ gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter) { + public static final native long _gtk_tree_model_get_path(long tree_model, long iter); + public static final long gtk_tree_model_get_path(long tree_model, long iter) { lock.lock(); try { return _gtk_tree_model_get_path(tree_model, iter); @@ -7135,8 +7135,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_tree_model_get_type(); - public static final long /*int*/ gtk_tree_model_get_type() { + public static final native long _gtk_tree_model_get_type(); + public static final long gtk_tree_model_get_type() { lock.lock(); try { return _gtk_tree_model_get_type(); @@ -7149,8 +7149,8 @@ public class GTK extends OS { * @param iter cast=(GtkTreeIter *) * @param parent cast=(GtkTreeIter *) */ - public static final native boolean _gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent); - public static final boolean gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent) { + public static final native boolean _gtk_tree_model_iter_children(long model, long iter, long parent); + public static final boolean gtk_tree_model_iter_children(long model, long iter, long parent) { lock.lock(); try { return _gtk_tree_model_iter_children(model, iter, parent); @@ -7162,8 +7162,8 @@ public class GTK extends OS { * @param model cast=(GtkTreeModel *) * @param iter cast=(GtkTreeIter *) */ - public static final native int _gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter); - public static final int gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter) { + public static final native int _gtk_tree_model_iter_n_children(long model, long iter); + public static final int gtk_tree_model_iter_n_children(long model, long iter) { lock.lock(); try { return _gtk_tree_model_iter_n_children(model, iter); @@ -7175,8 +7175,8 @@ public class GTK extends OS { * @param model cast=(GtkTreeModel *) * @param iter cast=(GtkTreeIter *) */ - public static final native boolean _gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter); - public static final boolean gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter) { + public static final native boolean _gtk_tree_model_iter_next(long model, long iter); + public static final boolean gtk_tree_model_iter_next(long model, long iter) { lock.lock(); try { return _gtk_tree_model_iter_next(model, iter); @@ -7189,8 +7189,8 @@ public class GTK extends OS { * @param iter cast=(GtkTreeIter *) * @param parent cast=(GtkTreeIter *) */ - public static final native boolean _gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n); - public static final boolean gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n) { + public static final native boolean _gtk_tree_model_iter_nth_child(long tree_model, long iter, long parent, int n); + public static final boolean gtk_tree_model_iter_nth_child(long tree_model, long iter, long parent, int n) { lock.lock(); try { return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n); @@ -7199,8 +7199,8 @@ public class GTK extends OS { } } /** @param path cast=(GtkTreePath *) */ - public static final native void _gtk_tree_path_append_index(long /*int*/ path, int index); - public static final void gtk_tree_path_append_index(long /*int*/ path, int index) { + public static final native void _gtk_tree_path_append_index(long path, int index); + public static final void gtk_tree_path_append_index(long path, int index) { lock.lock(); try { _gtk_tree_path_append_index(path, index); @@ -7212,8 +7212,8 @@ public class GTK extends OS { * @param a cast=(const GtkTreePath *) * @param b cast=(const GtkTreePath *) */ - public static final native long /*int*/ _gtk_tree_path_compare(long /*int*/ a, long /*int*/ b); - public static final long /*int*/ gtk_tree_path_compare(long /*int*/ a, long /*int*/ b) { + public static final native long _gtk_tree_path_compare(long a, long b); + public static final long gtk_tree_path_compare(long a, long b) { lock.lock(); try { return _gtk_tree_path_compare(a, b); @@ -7222,8 +7222,8 @@ public class GTK extends OS { } } /** @param path cast=(GtkTreePath *) */ - public static final native void _gtk_tree_path_free(long /*int*/ path); - public static final void gtk_tree_path_free(long /*int*/ path) { + public static final native void _gtk_tree_path_free(long path); + public static final void gtk_tree_path_free(long path) { lock.lock(); try { _gtk_tree_path_free(path); @@ -7232,8 +7232,8 @@ public class GTK extends OS { } } /** @param path cast=(GtkTreePath *) */ - public static final native int _gtk_tree_path_get_depth(long /*int*/ path); - public static final int gtk_tree_path_get_depth(long /*int*/ path) { + public static final native int _gtk_tree_path_get_depth(long path); + public static final int gtk_tree_path_get_depth(long path) { lock.lock(); try { return _gtk_tree_path_get_depth(path); @@ -7242,8 +7242,8 @@ public class GTK extends OS { } } /** @param path cast=(GtkTreePath *) */ - public static final native long /*int*/ _gtk_tree_path_get_indices(long /*int*/ path); - public static final long /*int*/ gtk_tree_path_get_indices(long /*int*/ path) { + public static final native long _gtk_tree_path_get_indices(long path); + public static final long gtk_tree_path_get_indices(long path) { lock.lock(); try { return _gtk_tree_path_get_indices(path); @@ -7251,8 +7251,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_tree_path_new(); - public static final long /*int*/ gtk_tree_path_new() { + public static final native long _gtk_tree_path_new(); + public static final long gtk_tree_path_new() { lock.lock(); try { return _gtk_tree_path_new(); @@ -7261,8 +7261,8 @@ public class GTK extends OS { } } /** @param path cast=(const gchar *) */ - public static final native long /*int*/ _gtk_tree_path_new_from_string(byte[] path); - public static final long /*int*/ gtk_tree_path_new_from_string(byte[] path) { + public static final native long _gtk_tree_path_new_from_string(byte[] path); + public static final long gtk_tree_path_new_from_string(byte[] path) { lock.lock(); try { return _gtk_tree_path_new_from_string(path); @@ -7271,8 +7271,8 @@ public class GTK extends OS { } } /** @param path cast=(const gchar *) */ - public static final native long /*int*/ _gtk_tree_path_new_from_string(long /*int*/ path); - public static final long /*int*/ gtk_tree_path_new_from_string(long /*int*/ path) { + public static final native long _gtk_tree_path_new_from_string(long path); + public static final long gtk_tree_path_new_from_string(long path) { lock.lock(); try { return _gtk_tree_path_new_from_string(path); @@ -7281,8 +7281,8 @@ public class GTK extends OS { } } /** @param path cast=(GtkTreePath *) */ - public static final native void _gtk_tree_path_next(long /*int*/ path); - public static final void gtk_tree_path_next(long /*int*/ path) { + public static final native void _gtk_tree_path_next(long path); + public static final void gtk_tree_path_next(long path) { lock.lock(); try { _gtk_tree_path_next(path); @@ -7291,8 +7291,8 @@ public class GTK extends OS { } } /** @param path cast=(GtkTreePath *) */ - public static final native boolean _gtk_tree_path_prev(long /*int*/ path); - public static final boolean gtk_tree_path_prev(long /*int*/ path) { + public static final native boolean _gtk_tree_path_prev(long path); + public static final boolean gtk_tree_path_prev(long path) { lock.lock(); try { return _gtk_tree_path_prev(path); @@ -7301,8 +7301,8 @@ public class GTK extends OS { } } /** @param path cast=(GtkTreePath *) */ - public static final native boolean _gtk_tree_path_up(long /*int*/ path); - public static final boolean gtk_tree_path_up(long /*int*/ path) { + public static final native boolean _gtk_tree_path_up(long path); + public static final boolean gtk_tree_path_up(long path) { lock.lock(); try { return _gtk_tree_path_up(path); @@ -7313,8 +7313,8 @@ public class GTK extends OS { /** * @param selection cast=(GtkTreeSelection *) */ - public static final native int _gtk_tree_selection_count_selected_rows(long /*int*/ selection); - public static final int gtk_tree_selection_count_selected_rows(long /*int*/ selection) { + public static final native int _gtk_tree_selection_count_selected_rows(long selection); + public static final int gtk_tree_selection_count_selected_rows(long selection) { lock.lock(); try { return _gtk_tree_selection_count_selected_rows(selection); @@ -7326,8 +7326,8 @@ public class GTK extends OS { * @param selection cast=(GtkTreeSelection *) * @param model cast=(GtkTreeModel **) */ - public static final native long /*int*/ _gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model); - public static final long /*int*/ gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model) { + public static final native long _gtk_tree_selection_get_selected_rows(long selection, long /*int*/[] model); + public static final long gtk_tree_selection_get_selected_rows(long selection, long /*int*/[] model) { lock.lock(); try { return _gtk_tree_selection_get_selected_rows(selection, model); @@ -7339,8 +7339,8 @@ public class GTK extends OS { * @param selection cast=(GtkTreeSelection *) * @param path cast=(GtkTreePath *) */ - public static final native boolean _gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path); - public static final boolean gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path) { + public static final native boolean _gtk_tree_selection_path_is_selected(long selection, long path); + public static final boolean gtk_tree_selection_path_is_selected(long selection, long path) { lock.lock(); try { return _gtk_tree_selection_path_is_selected(selection, path); @@ -7349,8 +7349,8 @@ public class GTK extends OS { } } /** @param selection cast=(GtkTreeSelection *) */ - public static final native void _gtk_tree_selection_select_all(long /*int*/ selection); - public static final void gtk_tree_selection_select_all(long /*int*/ selection) { + public static final native void _gtk_tree_selection_select_all(long selection); + public static final void gtk_tree_selection_select_all(long selection) { lock.lock(); try { _gtk_tree_selection_select_all(selection); @@ -7362,8 +7362,8 @@ public class GTK extends OS { * @param selection cast=(GtkTreeSelection *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter); - public static final void gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter) { + public static final native void _gtk_tree_selection_select_iter(long selection, long iter); + public static final void gtk_tree_selection_select_iter(long selection, long iter) { lock.lock(); try { _gtk_tree_selection_select_iter(selection, iter); @@ -7374,8 +7374,8 @@ public class GTK extends OS { /** * @param selection cast=(GtkTreeSelection *) */ - public static final native long /*int*/ _gtk_tree_selection_get_select_function(long /*int*/ selection); - public static final long /*int*/ gtk_tree_selection_get_select_function(long /*int*/ selection) { + public static final native long _gtk_tree_selection_get_select_function(long selection); + public static final long gtk_tree_selection_get_select_function(long selection) { lock.lock(); try { return _gtk_tree_selection_get_select_function(selection); @@ -7389,8 +7389,8 @@ public class GTK extends OS { * @param data cast=(gpointer) * @param destroy cast=(GDestroyNotify) */ - public static final native void _gtk_tree_selection_set_select_function(long /*int*/ selection, long /*int*/ func, long /*int*/ data, long /*int*/ destroy); - public static final void gtk_tree_selection_set_select_function(long /*int*/ selection, long /*int*/ func, long /*int*/ data, long /*int*/ destroy) { + public static final native void _gtk_tree_selection_set_select_function(long selection, long func, long data, long destroy); + public static final void gtk_tree_selection_set_select_function(long selection, long func, long data, long destroy) { lock.lock(); try { _gtk_tree_selection_set_select_function(selection, func, data, destroy); @@ -7402,8 +7402,8 @@ public class GTK extends OS { * @param selection cast=(GtkTreeSelection *) * @param path cast=(GtkTreePath *) */ - public static final native void _gtk_tree_selection_select_path(long /*int*/ selection, long /*int*/ path); - public static final void gtk_tree_selection_select_path(long /*int*/ selection, long /*int*/ path) { + public static final native void _gtk_tree_selection_select_path(long selection, long path); + public static final void gtk_tree_selection_select_path(long selection, long path) { lock.lock(); try { _gtk_tree_selection_select_path(selection, path); @@ -7415,8 +7415,8 @@ public class GTK extends OS { * @param selection cast=(GtkTreeSelection *) * @param mode cast=(GtkSelectionMode) */ - public static final native void _gtk_tree_selection_set_mode(long /*int*/ selection, int mode); - public static final void gtk_tree_selection_set_mode(long /*int*/ selection, int mode) { + public static final native void _gtk_tree_selection_set_mode(long selection, int mode); + public static final void gtk_tree_selection_set_mode(long selection, int mode) { lock.lock(); try { _gtk_tree_selection_set_mode(selection, mode); @@ -7428,8 +7428,8 @@ public class GTK extends OS { * @param selection cast=(GtkTreeSelection *) * @param path cast=(GtkTreePath *) */ - public static final native void _gtk_tree_selection_unselect_path(long /*int*/ selection, long /*int*/ path); - public static final void gtk_tree_selection_unselect_path(long /*int*/ selection, long /*int*/ path) { + public static final native void _gtk_tree_selection_unselect_path(long selection, long path); + public static final void gtk_tree_selection_unselect_path(long selection, long path) { lock.lock(); try { _gtk_tree_selection_unselect_path(selection, path); @@ -7438,8 +7438,8 @@ public class GTK extends OS { } } /** @param selection cast=(GtkTreeSelection *) */ - public static final native void _gtk_tree_selection_unselect_all(long /*int*/ selection); - public static final void gtk_tree_selection_unselect_all(long /*int*/ selection) { + public static final native void _gtk_tree_selection_unselect_all(long selection); + public static final void gtk_tree_selection_unselect_all(long selection) { lock.lock(); try { _gtk_tree_selection_unselect_all(selection); @@ -7451,8 +7451,8 @@ public class GTK extends OS { * @param selection cast=(GtkTreeSelection *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter); - public static final void gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter) { + public static final native void _gtk_tree_selection_unselect_iter(long selection, long iter); + public static final void gtk_tree_selection_unselect_iter(long selection, long iter) { lock.lock(); try { _gtk_tree_selection_unselect_iter(selection, iter); @@ -7465,8 +7465,8 @@ public class GTK extends OS { * @param iter cast=(GtkTreeIter *) * @param parent cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent); - public static final void gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent) { + public static final native void _gtk_tree_store_append(long store, long iter, long parent); + public static final void gtk_tree_store_append(long store, long iter, long parent) { lock.lock(); try { _gtk_tree_store_append(store, iter, parent); @@ -7475,8 +7475,8 @@ public class GTK extends OS { } } /** @param store cast=(GtkTreeStore *) */ - public static final native void _gtk_tree_store_clear(long /*int*/ store); - public static final void gtk_tree_store_clear(long /*int*/ store) { + public static final native void _gtk_tree_store_clear(long store); + public static final void gtk_tree_store_clear(long store) { lock.lock(); try { _gtk_tree_store_clear(store); @@ -7490,8 +7490,8 @@ public class GTK extends OS { * @param parent cast=(GtkTreeIter *) * @param position cast=(gint) */ - public static final native void _gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position); - public static final void gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position) { + public static final native void _gtk_tree_store_insert(long store, long iter, long parent, int position); + public static final void gtk_tree_store_insert(long store, long iter, long parent, int position) { lock.lock(); try { _gtk_tree_store_insert(store, iter, parent, position); @@ -7500,8 +7500,8 @@ public class GTK extends OS { } } /** @param types cast=(GType *) */ - public static final native long /*int*/ _gtk_tree_store_newv(int numColumns, long /*int*/[] types); - public static final long /*int*/ gtk_tree_store_newv(int numColumns, long /*int*/[] types) { + public static final native long _gtk_tree_store_newv(int numColumns, long /*int*/[] types); + public static final long gtk_tree_store_newv(int numColumns, long /*int*/[] types) { lock.lock(); try { return _gtk_tree_store_newv(numColumns, types); @@ -7513,8 +7513,8 @@ public class GTK extends OS { * @param store cast=(GtkTreeStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter); - public static final void gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter) { + public static final native void _gtk_tree_store_remove(long store, long iter); + public static final void gtk_tree_store_remove(long store, long iter) { lock.lock(); try { _gtk_tree_store_remove(store, iter); @@ -7526,8 +7526,8 @@ public class GTK extends OS { * @param store cast=(GtkTreeStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator); - public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) { + public static final native void _gtk_tree_store_set(long store, long iter, int column, byte[] value, int terminator); + public static final void gtk_tree_store_set(long store, long iter, int column, byte[] value, int terminator) { lock.lock(); try { _gtk_tree_store_set(store, iter, column, value, terminator); @@ -7539,8 +7539,8 @@ public class GTK extends OS { * @param store cast=(GtkTreeStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator); - public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) { + public static final native void _gtk_tree_store_set(long store, long iter, int column, int value, int terminator); + public static final void gtk_tree_store_set(long store, long iter, int column, int value, int terminator) { lock.lock(); try { _gtk_tree_store_set(store, iter, column, value, terminator); @@ -7552,8 +7552,8 @@ public class GTK extends OS { * @param store cast=(GtkTreeStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator); - public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) { + public static final native void _gtk_tree_store_set(long store, long iter, int column, long value, int terminator); + public static final void gtk_tree_store_set(long store, long iter, int column, long value, int terminator) { lock.lock(); try { _gtk_tree_store_set(store, iter, column, value, terminator); @@ -7566,8 +7566,8 @@ public class GTK extends OS { * @param iter cast=(GtkTreeIter *) * @param value flags=no_out */ - public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator); - public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator) { + public static final native void _gtk_tree_store_set(long store, long iter, int column, GdkRGBA value, int terminator); + public static final void gtk_tree_store_set(long store, long iter, int column, GdkRGBA value, int terminator) { lock.lock(); try { _gtk_tree_store_set(store, iter, column, value, terminator); @@ -7579,8 +7579,8 @@ public class GTK extends OS { * @param store cast=(GtkTreeStore *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator); - public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) { + public static final native void _gtk_tree_store_set(long store, long iter, int column, boolean value, int terminator); + public static final void gtk_tree_store_set(long store, long iter, int column, boolean value, int terminator) { lock.lock(); try { _gtk_tree_store_set(store, iter, column, value, terminator); @@ -7592,8 +7592,8 @@ public class GTK extends OS { * @param view cast=(GtkTreeView *) * @param path cast=(GtkTreePath *) */ - public static final native long /*int*/ _gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path); - public static final long /*int*/ gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path) { + public static final native long _gtk_tree_view_create_row_drag_icon(long view, long path); + public static final long gtk_tree_view_create_row_drag_icon(long view, long path) { lock.lock(); try { return _gtk_tree_view_create_row_drag_icon(view, path); @@ -7605,8 +7605,8 @@ public class GTK extends OS { * @param view cast=(GtkTreeView *) * @param path cast=(GtkTreePath *) */ - public static final native boolean _gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path); - public static final boolean gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path) { + public static final native boolean _gtk_tree_view_collapse_row(long view, long path); + public static final boolean gtk_tree_view_collapse_row(long view, long path) { lock.lock(); try { return _gtk_tree_view_collapse_row(view, path); @@ -7620,8 +7620,8 @@ public class GTK extends OS { * @param attribute cast=(const gchar *) * @param column cast=(gint) */ - public static final native void _gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column); - public static final void gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column) { + public static final native void _gtk_tree_view_column_add_attribute(long treeColumn, long cellRenderer, byte[] attribute, int column); + public static final void gtk_tree_view_column_add_attribute(long treeColumn, long cellRenderer, byte[] attribute, int column) { lock.lock(); try { _gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column); @@ -7635,8 +7635,8 @@ public class GTK extends OS { * @param start_pos cast=(gint *) * @param width cast=(gint *) */ - public static final native boolean _gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width); - public static final boolean gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width) { + public static final native boolean _gtk_tree_view_column_cell_get_position(long tree_column, long cell_renderer, int[] start_pos, int[] width); + public static final boolean gtk_tree_view_column_cell_get_position(long tree_column, long cell_renderer, int[] start_pos, int[] width) { lock.lock(); try { return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width); @@ -7652,8 +7652,8 @@ public class GTK extends OS { * @param width cast=(gint *) * @param height cast=(gint *) */ - public static final native void _gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height); - public static final void gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) { + public static final native void _gtk_tree_view_column_cell_get_size(long tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height); + public static final void gtk_tree_view_column_cell_get_size(long tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) { lock.lock(); try { _gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height); @@ -7666,8 +7666,8 @@ public class GTK extends OS { * @param tree_model cast=(GtkTreeModel *) * @param iter cast=(GtkTreeIter *) */ - public static final native void _gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded); - public static final void gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded) { + public static final native void _gtk_tree_view_column_cell_set_cell_data(long tree_column, long tree_model, long iter, boolean is_expander, boolean is_expanded); + public static final void gtk_tree_view_column_cell_set_cell_data(long tree_column, long tree_model, long iter, boolean is_expander, boolean is_expanded) { lock.lock(); try { _gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded); @@ -7676,8 +7676,8 @@ public class GTK extends OS { } } /** @param tree_column cast=(GtkTreeViewColumn *) */ - public static final native void _gtk_tree_view_column_clear(long /*int*/ tree_column); - public static final void gtk_tree_view_column_clear(long /*int*/ tree_column) { + public static final native void _gtk_tree_view_column_clear(long tree_column); + public static final void gtk_tree_view_column_clear(long tree_column) { lock.lock(); try { _gtk_tree_view_column_clear(tree_column); @@ -7688,8 +7688,8 @@ public class GTK extends OS { /** * @param column cast=(GtkTreeViewColumn *) */ - public static final native long /*int*/_gtk_tree_view_column_get_button(long /*int*/ column); - public static final long /*int*/ gtk_tree_view_column_get_button(long /*int*/ column) { + public static final native long /*int*/_gtk_tree_view_column_get_button(long column); + public static final long gtk_tree_view_column_get_button(long column) { lock.lock(); try { return _gtk_tree_view_column_get_button(column); @@ -7698,8 +7698,8 @@ public class GTK extends OS { } } /** @param column cast=(GtkTreeViewColumn *) */ - public static final native int _gtk_tree_view_column_get_fixed_width(long /*int*/ column); - public static final int gtk_tree_view_column_get_fixed_width(long /*int*/ column) { + public static final native int _gtk_tree_view_column_get_fixed_width(long column); + public static final int gtk_tree_view_column_get_fixed_width(long column) { lock.lock(); try { return _gtk_tree_view_column_get_fixed_width(column); @@ -7708,8 +7708,8 @@ public class GTK extends OS { } } /** @param column cast=(GtkTreeViewColumn *) */ - public static final native boolean _gtk_tree_view_column_get_reorderable(long /*int*/ column); - public static final boolean gtk_tree_view_column_get_reorderable(long /*int*/ column) { + public static final native boolean _gtk_tree_view_column_get_reorderable(long column); + public static final boolean gtk_tree_view_column_get_reorderable(long column) { lock.lock(); try { return _gtk_tree_view_column_get_reorderable(column); @@ -7718,8 +7718,8 @@ public class GTK extends OS { } } /** @param column cast=(GtkTreeViewColumn *) */ - public static final native boolean _gtk_tree_view_column_get_resizable(long /*int*/ column); - public static final boolean gtk_tree_view_column_get_resizable(long /*int*/ column) { + public static final native boolean _gtk_tree_view_column_get_resizable(long column); + public static final boolean gtk_tree_view_column_get_resizable(long column) { lock.lock(); try { return _gtk_tree_view_column_get_resizable(column); @@ -7728,8 +7728,8 @@ public class GTK extends OS { } } /** @param column cast=(GtkTreeViewColumn *) */ - public static final native boolean _gtk_tree_view_column_get_visible(long /*int*/ column); - public static final boolean gtk_tree_view_column_get_visible(long /*int*/ column) { + public static final native boolean _gtk_tree_view_column_get_visible(long column); + public static final boolean gtk_tree_view_column_get_visible(long column) { lock.lock(); try { return _gtk_tree_view_column_get_visible(column); @@ -7738,8 +7738,8 @@ public class GTK extends OS { } } /** @param column cast=(GtkTreeViewColumn *) */ - public static final native int _gtk_tree_view_column_get_width(long /*int*/ column); - public static final int gtk_tree_view_column_get_width(long /*int*/ column) { + public static final native int _gtk_tree_view_column_get_width(long column); + public static final int gtk_tree_view_column_get_width(long column) { lock.lock(); try { return _gtk_tree_view_column_get_width(column); @@ -7747,8 +7747,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_tree_view_column_new(); - public static final long /*int*/ gtk_tree_view_column_new() { + public static final native long _gtk_tree_view_column_new(); + public static final long gtk_tree_view_column_new() { lock.lock(); try { return _gtk_tree_view_column_new(); @@ -7761,8 +7761,8 @@ public class GTK extends OS { * @param cell_renderer cast=(GtkCellRenderer *) * @param expand cast=(gboolean) */ - public static final native void _gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand); - public static final void gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) { + public static final native void _gtk_tree_view_column_pack_start(long tree_column, long cell_renderer, boolean expand); + public static final void gtk_tree_view_column_pack_start(long tree_column, long cell_renderer, boolean expand) { lock.lock(); try { _gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand); @@ -7775,8 +7775,8 @@ public class GTK extends OS { * @param cell_renderer cast=(GtkCellRenderer *) * @param expand cast=(gboolean) */ - public static final native void _gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand); - public static final void gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) { + public static final native void _gtk_tree_view_column_pack_end(long tree_column, long cell_renderer, boolean expand); + public static final void gtk_tree_view_column_pack_end(long tree_column, long cell_renderer, boolean expand) { lock.lock(); try { _gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand); @@ -7785,8 +7785,8 @@ public class GTK extends OS { } } /** @param tree_column cast=(GtkTreeViewColumn *) */ - public static final native void _gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign); - public static final void gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign) { + public static final native void _gtk_tree_view_column_set_alignment(long tree_column, float xalign); + public static final void gtk_tree_view_column_set_alignment(long tree_column, float xalign) { lock.lock(); try { _gtk_tree_view_column_set_alignment(tree_column, xalign); @@ -7801,8 +7801,8 @@ public class GTK extends OS { * @param func_data cast=(gpointer) * @param destroy cast=(GDestroyNotify) */ - public static final native void _gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy); - public static final void gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy) { + public static final native void _gtk_tree_view_column_set_cell_data_func(long tree_column, long cell_renderer, long func, long func_data, long destroy); + public static final void gtk_tree_view_column_set_cell_data_func(long tree_column, long cell_renderer, long func, long func_data, long destroy) { lock.lock(); try { _gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy); @@ -7814,8 +7814,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param clickable cast=(gboolean) */ - public static final native void _gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable); - public static final void gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable) { + public static final native void _gtk_tree_view_column_set_clickable(long column, boolean clickable); + public static final void gtk_tree_view_column_set_clickable(long column, boolean clickable) { lock.lock(); try { _gtk_tree_view_column_set_clickable(column, clickable); @@ -7827,8 +7827,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param fixed_width cast=(gint) */ - public static final native void _gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width); - public static final void gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width) { + public static final native void _gtk_tree_view_column_set_fixed_width(long column, int fixed_width); + public static final void gtk_tree_view_column_set_fixed_width(long column, int fixed_width) { lock.lock(); try { _gtk_tree_view_column_set_fixed_width(column, fixed_width); @@ -7840,8 +7840,8 @@ public class GTK extends OS { * @param tree_column cast=(GtkTreeViewColumn *) * @param min_width cast=(gint) */ - public static final native void _gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width); - public static final void gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width) { + public static final native void _gtk_tree_view_column_set_min_width(long tree_column, int min_width); + public static final void gtk_tree_view_column_set_min_width(long tree_column, int min_width) { lock.lock(); try { _gtk_tree_view_column_set_min_width(tree_column, min_width); @@ -7853,8 +7853,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param reorderable cast=(gboolean) */ - public static final native void _gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable); - public static final void gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable) { + public static final native void _gtk_tree_view_column_set_reorderable(long column, boolean reorderable); + public static final void gtk_tree_view_column_set_reorderable(long column, boolean reorderable) { lock.lock(); try { _gtk_tree_view_column_set_reorderable(column, reorderable); @@ -7866,8 +7866,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param resizable cast=(gboolean) */ - public static final native void _gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable); - public static final void gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable) { + public static final native void _gtk_tree_view_column_set_resizable(long column, boolean resizable); + public static final void gtk_tree_view_column_set_resizable(long column, boolean resizable) { lock.lock(); try { _gtk_tree_view_column_set_resizable(column, resizable); @@ -7879,8 +7879,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param type cast=(GtkTreeViewColumnSizing) */ - public static final native void _gtk_tree_view_column_set_sizing(long /*int*/ column, int type); - public static final void gtk_tree_view_column_set_sizing(long /*int*/ column, int type) { + public static final native void _gtk_tree_view_column_set_sizing(long column, int type); + public static final void gtk_tree_view_column_set_sizing(long column, int type) { lock.lock(); try { _gtk_tree_view_column_set_sizing(column, type); @@ -7892,8 +7892,8 @@ public class GTK extends OS { * @param tree_column cast=(GtkTreeViewColumn *) * @param setting cast=(gboolean) */ - public static final native void _gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting); - public static final void gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting) { + public static final native void _gtk_tree_view_column_set_sort_indicator(long tree_column, boolean setting); + public static final void gtk_tree_view_column_set_sort_indicator(long tree_column, boolean setting) { lock.lock(); try { _gtk_tree_view_column_set_sort_indicator(tree_column, setting); @@ -7905,8 +7905,8 @@ public class GTK extends OS { * @param tree_column cast=(GtkTreeViewColumn *) * @param order cast=(GtkSortType) */ - public static final native void _gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order); - public static final void gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order) { + public static final native void _gtk_tree_view_column_set_sort_order(long tree_column, int order); + public static final void gtk_tree_view_column_set_sort_order(long tree_column, int order) { lock.lock(); try { _gtk_tree_view_column_set_sort_order(tree_column, order); @@ -7915,8 +7915,8 @@ public class GTK extends OS { } } /** @param tree_column cast=(GtkTreeViewColumn *) */ - public static final native void _gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible); - public static final void gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible) { + public static final native void _gtk_tree_view_column_set_visible (long tree_column, boolean visible); + public static final void gtk_tree_view_column_set_visible (long tree_column, boolean visible) { lock.lock(); try { _gtk_tree_view_column_set_visible(tree_column, visible); @@ -7928,8 +7928,8 @@ public class GTK extends OS { * @param tree_column cast=(GtkTreeViewColumn *) * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget); - public static final void gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget) { + public static final native void _gtk_tree_view_column_set_widget(long tree_column, long widget); + public static final void gtk_tree_view_column_set_widget(long tree_column, long widget) { lock.lock(); try { _gtk_tree_view_column_set_widget(tree_column, widget); @@ -7941,8 +7941,8 @@ public class GTK extends OS { * @param view cast=(GtkTreeView *) * @param path cast=(GtkTreePath *) */ - public static final native void _gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos); - public static final void gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos) { + public static final native void _gtk_tree_view_set_drag_dest_row(long view, long path, int pos); + public static final void gtk_tree_view_set_drag_dest_row(long view, long path, int pos) { lock.lock(); try { _gtk_tree_view_set_drag_dest_row(view, path, pos); @@ -7955,8 +7955,8 @@ public class GTK extends OS { * @param path cast=(GtkTreePath *) * @param open_all cast=(gboolean) */ - public static final native boolean _gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all); - public static final boolean gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all) { + public static final native boolean _gtk_tree_view_expand_row(long view, long path, boolean open_all); + public static final boolean gtk_tree_view_expand_row(long view, long path, boolean open_all) { lock.lock(); try { return _gtk_tree_view_expand_row(view, path, open_all); @@ -7970,8 +7970,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param rect cast=(GdkRectangle *) */ - public static final native void _gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect); - public static final void gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) { + public static final native void _gtk_tree_view_get_background_area(long tree_view, long path, long column, GdkRectangle rect); + public static final void gtk_tree_view_get_background_area(long tree_view, long path, long column, GdkRectangle rect) { lock.lock(); try { _gtk_tree_view_get_background_area(tree_view, path, column, rect); @@ -7982,9 +7982,9 @@ public class GTK extends OS { /** * @param tree_view cast=(GtkTreeView *) */ - public static final native long /*int*/ _gtk_tree_view_get_bin_window(long /*int*/ tree_view); + public static final native long _gtk_tree_view_get_bin_window(long tree_view); /** [GTK3 only, if-def'd in os.h] */ - public static final long /*int*/ gtk_tree_view_get_bin_window(long /*int*/ tree_view) { + public static final long gtk_tree_view_get_bin_window(long tree_view) { lock.lock(); try { return _gtk_tree_view_get_bin_window(tree_view); @@ -7998,8 +7998,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param rect cast=(GdkRectangle *),flags=no_in */ - public static final native void _gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect); - public static final void gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) { + public static final native void _gtk_tree_view_get_cell_area(long tree_view, long path, long column, GdkRectangle rect); + public static final void gtk_tree_view_get_cell_area(long tree_view, long path, long column, GdkRectangle rect) { lock.lock(); try { _gtk_tree_view_get_cell_area(tree_view, path, column, rect); @@ -8008,8 +8008,8 @@ public class GTK extends OS { } } /** @param tree_view cast=(GtkTreeView *) */ - public static final native long /*int*/_gtk_tree_view_get_expander_column(long /*int*/ tree_view); - public static final long /*int*/gtk_tree_view_get_expander_column(long /*int*/ tree_view) { + public static final native long /*int*/_gtk_tree_view_get_expander_column(long tree_view); + public static final long /*int*/gtk_tree_view_get_expander_column(long tree_view) { lock.lock(); try { return _gtk_tree_view_get_expander_column(tree_view); @@ -8021,8 +8021,8 @@ public class GTK extends OS { * @param tree_view cast=(GtkTreeView *) * @param n cast=(gint) */ - public static final native long /*int*/ _gtk_tree_view_get_column(long /*int*/ tree_view, int n); - public static final long /*int*/ gtk_tree_view_get_column(long /*int*/ tree_view, int n) { + public static final native long _gtk_tree_view_get_column(long tree_view, int n); + public static final long gtk_tree_view_get_column(long tree_view, int n) { lock.lock(); try { return _gtk_tree_view_get_column(tree_view, n); @@ -8031,8 +8031,8 @@ public class GTK extends OS { } } /** @param tree_view cast=(GtkTreeView *) */ - public static final native long /*int*/ _gtk_tree_view_get_columns(long /*int*/ tree_view); - public static final long /*int*/ gtk_tree_view_get_columns(long /*int*/ tree_view) { + public static final native long _gtk_tree_view_get_columns(long tree_view); + public static final long gtk_tree_view_get_columns(long tree_view) { lock.lock(); try { return _gtk_tree_view_get_columns(tree_view); @@ -8045,8 +8045,8 @@ public class GTK extends OS { * @param path cast=(GtkTreePath **) * @param focus_column cast=(GtkTreeViewColumn **) */ - public static final native void _gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column); - public static final void gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column) { + public static final native void _gtk_tree_view_get_cursor(long tree_view, long /*int*/[] path, long /*int*/[] focus_column); + public static final void gtk_tree_view_get_cursor(long tree_view, long /*int*/[] path, long /*int*/[] focus_column) { lock.lock(); try { _gtk_tree_view_get_cursor(tree_view, path, focus_column); @@ -8055,8 +8055,8 @@ public class GTK extends OS { } } /** @param tree_view cast=(GtkTreeView *) */ - public static final native boolean _gtk_tree_view_get_headers_visible(long /*int*/ tree_view); - public static final boolean gtk_tree_view_get_headers_visible(long /*int*/ tree_view) { + public static final native boolean _gtk_tree_view_get_headers_visible(long tree_view); + public static final boolean gtk_tree_view_get_headers_visible(long tree_view) { lock.lock(); try { return _gtk_tree_view_get_headers_visible(tree_view); @@ -8073,8 +8073,8 @@ public class GTK extends OS { * @param cell_x cast=(gint *) * @param cell_y cast=(gint *) */ - public static final native boolean _gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y); - public static final boolean gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y) { + public static final native boolean _gtk_tree_view_get_path_at_pos(long tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y); + public static final boolean gtk_tree_view_get_path_at_pos(long tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y) { lock.lock(); try { return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y); @@ -8083,8 +8083,8 @@ public class GTK extends OS { } } /** @param tree_view cast=(GtkTreeView *) */ - public static final native long /*int*/ _gtk_tree_view_get_selection(long /*int*/ tree_view); - public static final long /*int*/ gtk_tree_view_get_selection(long /*int*/ tree_view) { + public static final native long _gtk_tree_view_get_selection(long tree_view); + public static final long gtk_tree_view_get_selection(long tree_view) { lock.lock(); try { return _gtk_tree_view_get_selection(tree_view); @@ -8096,8 +8096,8 @@ public class GTK extends OS { * @param tree_view cast=(GtkTreeView *) * @param visible_rect flags=no_in */ - public static final native void _gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect); - public static final void gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect) { + public static final native void _gtk_tree_view_get_visible_rect(long tree_view, GdkRectangle visible_rect); + public static final void gtk_tree_view_get_visible_rect(long tree_view, GdkRectangle visible_rect) { lock.lock(); try { _gtk_tree_view_get_visible_rect(tree_view, visible_rect); @@ -8110,8 +8110,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param position cast=(gint) */ - public static final native int _gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position); - public static final int gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position) { + public static final native int _gtk_tree_view_insert_column(long tree_view, long column, int position); + public static final int gtk_tree_view_insert_column(long tree_view, long column, int position) { lock.lock(); try { return _gtk_tree_view_insert_column(tree_view, column, position); @@ -8124,8 +8124,8 @@ public class GTK extends OS { * @param column cast=(GtkTreeViewColumn *) * @param base_column cast=(GtkTreeViewColumn *) */ - public static final native void _gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/ base_column); - public static final void gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/base_column) { + public static final native void _gtk_tree_view_move_column_after(long tree_view, long column, long base_column); + public static final void gtk_tree_view_move_column_after(long tree_view, long column, long /*int*/base_column) { lock.lock(); try { _gtk_tree_view_move_column_after(tree_view, column, base_column); @@ -8134,8 +8134,8 @@ public class GTK extends OS { } } /** @param model cast=(GtkTreeModel *) */ - public static final native long /*int*/ _gtk_tree_view_new_with_model(long /*int*/ model); - public static final long /*int*/ gtk_tree_view_new_with_model(long /*int*/ model) { + public static final native long _gtk_tree_view_new_with_model(long model); + public static final long gtk_tree_view_new_with_model(long model) { lock.lock(); try { return _gtk_tree_view_new_with_model(model); @@ -8147,8 +8147,8 @@ public class GTK extends OS { * @param tree_view cast=(GtkTreeView *) * @param column cast=(GtkTreeViewColumn *) */ - public static final native void _gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column); - public static final void gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column) { + public static final native void _gtk_tree_view_remove_column(long tree_view, long column); + public static final void gtk_tree_view_remove_column(long tree_view, long column) { lock.lock(); try { _gtk_tree_view_remove_column(tree_view, column); @@ -8160,8 +8160,8 @@ public class GTK extends OS { * @param view cast=(GtkTreeView *) * @param path cast=(GtkTreePath *) */ - public static final native boolean _gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path); - public static final boolean gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path) { + public static final native boolean _gtk_tree_view_row_expanded(long view, long path); + public static final boolean gtk_tree_view_row_expanded(long view, long path) { lock.lock(); try { return _gtk_tree_view_row_expanded(view, path); @@ -8177,8 +8177,8 @@ public class GTK extends OS { * @param row_aligh cast=(gfloat) * @param column_align cast=(gfloat) */ - public static final native void _gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align); - public static final void gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align) { + public static final native void _gtk_tree_view_scroll_to_cell(long tree_view, long path, long column, boolean use_align, float row_aligh, float column_align); + public static final void gtk_tree_view_scroll_to_cell(long tree_view, long path, long column, boolean use_align, float row_aligh, float column_align) { lock.lock(); try { _gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align); @@ -8191,8 +8191,8 @@ public class GTK extends OS { * @param tree_x cast=(gint) * @param tree_y cast=(gint) */ - public static final native void _gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y); - public static final void gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y) { + public static final native void _gtk_tree_view_scroll_to_point (long tree_view, int tree_x, int tree_y); + public static final void gtk_tree_view_scroll_to_point (long tree_view, int tree_x, int tree_y) { lock.lock(); try { _gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y); @@ -8205,8 +8205,8 @@ public class GTK extends OS { * @param path cast=(GtkTreePath *) * @param focus_column cast=(GtkTreeViewColumn *) */ - public static final native void _gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing); - public static final void gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing) { + public static final native void _gtk_tree_view_set_cursor(long tree_view, long path, long focus_column, boolean start_editing); + public static final void gtk_tree_view_set_cursor(long tree_view, long path, long focus_column, boolean start_editing) { lock.lock(); try { _gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing); @@ -8218,8 +8218,8 @@ public class GTK extends OS { * @param tree_view cast=(GtkTreeView*) * @param grid_lines cast=(GtkTreeViewGridLines) */ - public static final native void _gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines); - public static final void gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines) { + public static final native void _gtk_tree_view_set_grid_lines(long tree_view, int grid_lines); + public static final void gtk_tree_view_set_grid_lines(long tree_view, int grid_lines) { lock.lock(); try { _gtk_tree_view_set_grid_lines(tree_view, grid_lines); @@ -8230,8 +8230,8 @@ public class GTK extends OS { /** * @param tree_view cast=(GtkTreeView*) */ - public static final native int _gtk_tree_view_get_grid_lines(long /*int*/ tree_view); - public static final int gtk_tree_view_get_grid_lines(long /*int*/ tree_view) { + public static final native int _gtk_tree_view_get_grid_lines(long tree_view); + public static final int gtk_tree_view_get_grid_lines(long tree_view) { lock.lock(); try { return _gtk_tree_view_get_grid_lines(tree_view); @@ -8243,8 +8243,8 @@ public class GTK extends OS { * @param tree_view cast=(GtkTreeView *) * @param visible cast=(gboolean) */ - public static final native void _gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible); - public static final void gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible) { + public static final native void _gtk_tree_view_set_headers_visible(long tree_view, boolean visible); + public static final void gtk_tree_view_set_headers_visible(long tree_view, boolean visible) { lock.lock(); try { _gtk_tree_view_set_headers_visible(tree_view, visible); @@ -8256,8 +8256,8 @@ public class GTK extends OS { * @param tree_view cast=(GtkTreeView *) * @param model cast=(GtkTreeModel *) */ - public static final native void _gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model); - public static final void gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model) { + public static final native void _gtk_tree_view_set_model(long tree_view, long model); + public static final void gtk_tree_view_set_model(long tree_view, long model) { lock.lock(); try { _gtk_tree_view_set_model(tree_view, model); @@ -8269,8 +8269,8 @@ public class GTK extends OS { * @param tree_view cast=(GtkTreeView *) * @param column cast=(gint) */ - public static final native void _gtk_tree_view_set_search_column(long /*int*/ tree_view, int column); - public static final void gtk_tree_view_set_search_column(long /*int*/ tree_view, int column) { + public static final native void _gtk_tree_view_set_search_column(long tree_view, int column); + public static final void gtk_tree_view_set_search_column(long tree_view, int column) { lock.lock(); try { _gtk_tree_view_set_search_column(tree_view, column); @@ -8279,8 +8279,8 @@ public class GTK extends OS { } } /** @param tree_view cast=(GtkTreeView *) */ - public static final native void _gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view); - public static final void gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view) { + public static final native void _gtk_tree_view_unset_rows_drag_dest(long tree_view); + public static final void gtk_tree_view_unset_rows_drag_dest(long tree_view) { lock.lock(); try { _gtk_tree_view_unset_rows_drag_dest(tree_view); @@ -8295,8 +8295,8 @@ public class GTK extends OS { * @param tx cast=(gint *) * @param ty cast=(gint *) */ - public static final native void _gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty); - public static final void gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty) { + public static final native void _gtk_tree_view_convert_bin_window_to_tree_coords(long tree_view, int bx, int by, int[] tx, int[] ty); + public static final void gtk_tree_view_convert_bin_window_to_tree_coords(long tree_view, int bx, int by, int[] tx, int[] ty) { lock.lock(); try { _gtk_tree_view_convert_bin_window_to_tree_coords(tree_view, bx, by, tx, ty); @@ -8308,8 +8308,8 @@ public class GTK extends OS { * @param viewport cast=(GtkViewport *) * @param type cast=(GtkShadowType) */ - public static final native void _gtk_viewport_set_shadow_type(long /*int*/ viewport, int type); - public static final void gtk_viewport_set_shadow_type(long /*int*/ viewport, int type) { + public static final native void _gtk_viewport_set_shadow_type(long viewport, int type); + public static final void gtk_viewport_set_shadow_type(long viewport, int type) { lock.lock(); try { _gtk_viewport_set_shadow_type(viewport, type); @@ -8324,8 +8324,8 @@ public class GTK extends OS { * @param accel_key cast=(guint) * @param accel_mods cast=(GdkModifierType) */ - public static final native void _gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags); - public static final void gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags) { + public static final native void _gtk_widget_add_accelerator(long widget, byte[] accel_signal, long accel_group, int accel_key, int accel_mods, int accel_flags); + public static final void gtk_widget_add_accelerator(long widget, byte[] accel_signal, long accel_group, int accel_key, int accel_mods, int accel_flags) { lock.lock(); try { _gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags); @@ -8338,9 +8338,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param events cast=(gint) */ - public static final native void _gtk_widget_add_events(long /*int*/ widget, int events); + public static final native void _gtk_widget_add_events(long widget, int events); /** [GTK3 only] */ - public static final void gtk_widget_add_events(long /*int*/ widget, int events) { + public static final void gtk_widget_add_events(long widget, int events) { lock.lock(); try { _gtk_widget_add_events(widget, events); @@ -8349,8 +8349,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_child_focus(long /*int*/ widget, int direction); - public static final boolean gtk_widget_child_focus(long /*int*/ widget, int direction) { + public static final native boolean _gtk_widget_child_focus(long widget, int direction); + public static final boolean gtk_widget_child_focus(long widget, int direction) { lock.lock(); try { return _gtk_widget_child_focus(widget, direction); @@ -8362,8 +8362,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param text cast=(const gchar *) */ - public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text); - public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text) { + public static final native long _gtk_widget_create_pango_layout(long widget, byte[] text); + public static final long gtk_widget_create_pango_layout(long widget, byte[] text) { lock.lock(); try { return _gtk_widget_create_pango_layout(widget, text); @@ -8375,8 +8375,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param text cast=(const gchar *) */ - public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text); - public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text) { + public static final native long _gtk_widget_create_pango_layout(long widget, long text); + public static final long gtk_widget_create_pango_layout(long widget, long text) { lock.lock(); try { return _gtk_widget_create_pango_layout(widget, text); @@ -8385,8 +8385,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_destroy(long /*int*/ widget); - public static final void gtk_widget_destroy(long /*int*/ widget) { + public static final native void _gtk_widget_destroy(long widget); + public static final void gtk_widget_destroy(long widget) { lock.lock(); try { _gtk_widget_destroy(widget); @@ -8399,9 +8399,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param cr cast=(cairo_t *) */ - public static final native void _gtk_widget_draw(long /*int*/ widget, long /*int*/ cr); + public static final native void _gtk_widget_draw(long widget, long cr); /** [GTK3 only] */ - public static final void gtk_widget_draw(long /*int*/ widget, long /*int*/ cr) { + public static final void gtk_widget_draw(long widget, long cr) { lock.lock(); try { _gtk_widget_draw(widget, cr); @@ -8413,8 +8413,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param event cast=(GdkEvent *) */ - public static final native boolean _gtk_widget_event(long /*int*/ widget, long /*int*/ event); - public static final boolean gtk_widget_event(long /*int*/ widget, long /*int*/ event) { + public static final native boolean _gtk_widget_event(long widget, long event); + public static final boolean gtk_widget_event(long widget, long event) { lock.lock(); try { return _gtk_widget_event(widget, event); @@ -8423,8 +8423,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_accessible (long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_accessible (long /*int*/ widget) { + public static final native long _gtk_widget_get_accessible (long widget); + public static final long gtk_widget_get_accessible (long widget) { lock.lock(); try { return _gtk_widget_get_accessible(widget); @@ -8433,8 +8433,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_visible (long /*int*/ widget); - public static final boolean gtk_widget_get_visible (long /*int*/ widget) { + public static final native boolean _gtk_widget_get_visible (long widget); + public static final boolean gtk_widget_get_visible (long widget) { lock.lock(); try { return _gtk_widget_get_visible(widget); @@ -8443,8 +8443,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_realized (long /*int*/ widget); - public static final boolean gtk_widget_get_realized (long /*int*/ widget) { + public static final native boolean _gtk_widget_get_realized (long widget); + public static final boolean gtk_widget_get_realized (long widget) { lock.lock(); try { return _gtk_widget_get_realized(widget); @@ -8455,9 +8455,9 @@ public class GTK extends OS { /** * @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_has_window (long /*int*/ widget); + public static final native boolean _gtk_widget_get_has_window (long widget); /** [GTK3 only, if-def'd in os.h] */ - public static final boolean gtk_widget_get_has_window (long /*int*/ widget) { + public static final boolean gtk_widget_get_has_window (long widget) { lock.lock(); try { return _gtk_widget_get_has_window(widget); @@ -8468,9 +8468,9 @@ public class GTK extends OS { /** * @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_has_surface (long /*int*/ widget); + public static final native boolean _gtk_widget_get_has_surface (long widget); /** [GTK4 only, if-def'd in os.h] */ - public static final boolean gtk_widget_get_has_surface (long /*int*/ widget) { + public static final boolean gtk_widget_get_has_surface (long widget) { lock.lock(); try { return _gtk_widget_get_has_surface(widget); @@ -8479,8 +8479,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_can_default (long /*int*/ widget); - public static final boolean gtk_widget_get_can_default (long /*int*/ widget) { + public static final native boolean _gtk_widget_get_can_default (long widget); + public static final boolean gtk_widget_get_can_default (long widget) { lock.lock(); try { return _gtk_widget_get_can_default(widget); @@ -8489,8 +8489,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_child_visible (long /*int*/ widget); - public static final boolean gtk_widget_get_child_visible (long /*int*/ widget) { + public static final native boolean _gtk_widget_get_child_visible (long widget); + public static final boolean gtk_widget_get_child_visible (long widget) { lock.lock(); try { return _gtk_widget_get_child_visible(widget); @@ -8502,9 +8502,9 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native int _gtk_widget_get_events(long /*int*/ widget); + public static final native int _gtk_widget_get_events(long widget); /** [GTK3 only] */ - public static final int gtk_widget_get_events(long /*int*/ widget) { + public static final int gtk_widget_get_events(long widget) { lock.lock(); try { return _gtk_widget_get_events(widget); @@ -8516,9 +8516,9 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_window (long /*int*/ widget); + public static final native long _gtk_widget_get_window (long widget); /** [GTK3 only] */ - public static final long /*int*/ gtk_widget_get_window (long /*int*/ widget) { + public static final long gtk_widget_get_window (long widget) { lock.lock(); try { return _gtk_widget_get_window(widget); @@ -8530,9 +8530,9 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_surface (long /*int*/ widget); + public static final native long _gtk_widget_get_surface (long widget); /** [GTK4 only] */ - public static final long /*int*/ gtk_widget_get_surface (long /*int*/ widget) { + public static final long gtk_widget_get_surface (long widget) { lock.lock(); try { return _gtk_widget_get_surface(widget); @@ -8544,8 +8544,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native int _gtk_widget_get_margin_start (long /*int*/ widget); - public static final int gtk_widget_get_margin_start (long /*int*/ widget) { + public static final native int _gtk_widget_get_margin_start (long widget); + public static final int gtk_widget_get_margin_start (long widget) { lock.lock(); try { return _gtk_widget_get_margin_start(widget); @@ -8557,8 +8557,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native int _gtk_widget_get_margin_end (long /*int*/ widget); - public static final int gtk_widget_get_margin_end (long /*int*/ widget) { + public static final native int _gtk_widget_get_margin_end (long widget); + public static final int gtk_widget_get_margin_end (long widget) { lock.lock(); try { return _gtk_widget_get_margin_end(widget); @@ -8570,8 +8570,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native int _gtk_widget_get_margin_top (long /*int*/ widget); - public static final int gtk_widget_get_margin_top (long /*int*/ widget) { + public static final native int _gtk_widget_get_margin_top (long widget); + public static final int gtk_widget_get_margin_top (long widget) { lock.lock(); try { return _gtk_widget_get_margin_top(widget); @@ -8583,8 +8583,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native int _gtk_widget_get_margin_bottom (long /*int*/ widget); - public static final int gtk_widget_get_margin_bottom (long /*int*/ widget) { + public static final native int _gtk_widget_get_margin_bottom (long widget); + public static final int gtk_widget_get_margin_bottom (long widget) { lock.lock(); try { return _gtk_widget_get_margin_bottom(widget); @@ -8593,8 +8593,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_get_mapped(long /*int*/ widget); - public static final boolean gtk_widget_get_mapped(long /*int*/ widget) { + public static final native boolean _gtk_widget_get_mapped(long widget); + public static final boolean gtk_widget_get_mapped(long widget) { lock.lock(); try { return _gtk_widget_get_mapped(widget); @@ -8603,8 +8603,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_pango_context(long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_pango_context(long /*int*/ widget) { + public static final native long _gtk_widget_get_pango_context(long widget); + public static final long gtk_widget_get_pango_context(long widget) { lock.lock(); try { return _gtk_widget_get_pango_context(widget); @@ -8613,8 +8613,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_parent(long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_parent(long /*int*/ widget) { + public static final native long _gtk_widget_get_parent(long widget); + public static final long gtk_widget_get_parent(long widget) { lock.lock(); try { return _gtk_widget_get_parent(widget); @@ -8626,8 +8626,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_parent_window(long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_parent_window(long /*int*/ widget) { + public static final native long _gtk_widget_get_parent_window(long widget); + public static final long gtk_widget_get_parent_window(long widget) { lock.lock(); try { return _gtk_widget_get_parent_window(widget); @@ -8639,8 +8639,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_parent_surface(long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_parent_surface(long /*int*/ widget) { + public static final native long _gtk_widget_get_parent_surface(long widget); + public static final long gtk_widget_get_parent_surface(long widget) { lock.lock(); try { return _gtk_widget_get_parent_surface(widget); @@ -8652,8 +8652,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param allocation cast=(GtkAllocation *),flags=no_in * */ - public static final native void _gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation); - public static final void gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation) { + public static final native void _gtk_widget_get_allocation (long widget, GtkAllocation allocation); + public static final void gtk_widget_get_allocation (long widget, GtkAllocation allocation) { lock.lock(); try { _gtk_widget_get_allocation(widget, allocation); @@ -8669,8 +8669,8 @@ public class GTK extends OS { * @param width cast=(gdouble) * @param height cast=(gdouble) */ - public static final native void _gtk_render_handle(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height); - public static final void gtk_render_handle(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) { + public static final native void _gtk_render_handle(long context, long cr, double x , double y, double width, double height); + public static final void gtk_render_handle(long context, long cr, double x , double y, double width, double height) { lock.lock(); try { _gtk_render_handle(context,cr, x ,y, width, height); @@ -8681,8 +8681,8 @@ public class GTK extends OS { /** * @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_style_context(long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_style_context(long /*int*/ widget) { + public static final native long _gtk_widget_get_style_context(long widget); + public static final long gtk_widget_get_style_context(long widget) { lock.lock(); try { return _gtk_widget_get_style_context(widget); @@ -8695,8 +8695,8 @@ public class GTK extends OS { * @param width cast=(gint *) * @param height cast=(gint *) */ - public static final native void _gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height); - public static final void gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height) { + public static final native void _gtk_widget_get_size_request(long widget, int [] width, int [] height); + public static final void gtk_widget_get_size_request(long widget, int [] width, int [] height) { lock.lock(); try { _gtk_widget_get_size_request(widget, width, height); @@ -8705,8 +8705,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_toplevel (long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_toplevel (long /*int*/ widget) { + public static final native long _gtk_widget_get_toplevel (long widget); + public static final long gtk_widget_get_toplevel (long widget) { lock.lock(); try { return _gtk_widget_get_toplevel(widget); @@ -8715,8 +8715,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native long /*int*/ _gtk_widget_get_tooltip_text (long /*int*/ widget); - public static final long /*int*/ gtk_widget_get_tooltip_text (long /*int*/ widget) { + public static final native long _gtk_widget_get_tooltip_text (long widget); + public static final long gtk_widget_get_tooltip_text (long widget) { lock.lock(); try { return _gtk_widget_get_tooltip_text(widget); @@ -8725,8 +8725,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_grab_focus(long /*int*/ widget); - public static final void gtk_widget_grab_focus(long /*int*/ widget) { + public static final native void _gtk_widget_grab_focus(long widget); + public static final void gtk_widget_grab_focus(long widget) { lock.lock(); try { _gtk_widget_grab_focus(widget); @@ -8735,8 +8735,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_has_focus(long /*int*/ widget); - public static final boolean gtk_widget_has_focus(long /*int*/ widget) { + public static final native boolean _gtk_widget_has_focus(long widget); + public static final boolean gtk_widget_has_focus(long widget) { lock.lock(); try { return _gtk_widget_has_focus(widget); @@ -8745,8 +8745,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_hide(long /*int*/ widget); - public static final void gtk_widget_hide(long /*int*/ widget) { + public static final native void _gtk_widget_hide(long widget); + public static final void gtk_widget_hide(long widget) { lock.lock(); try { _gtk_widget_hide(widget); @@ -8758,8 +8758,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param region cast=(cairo_region_t *) */ - public static final native void _gtk_widget_input_shape_combine_region(long /*int*/ widget, long /*int*/ region); - public static final void gtk_widget_input_shape_combine_region(long /*int*/ widget, long /*int*/ region) { + public static final native void _gtk_widget_input_shape_combine_region(long widget, long region); + public static final void gtk_widget_input_shape_combine_region(long widget, long region) { lock.lock(); try { _gtk_widget_input_shape_combine_region(widget, region); @@ -8768,8 +8768,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native boolean _gtk_widget_is_focus(long /*int*/ widget); - public static final boolean gtk_widget_is_focus(long /*int*/ widget) { + public static final native boolean _gtk_widget_is_focus(long widget); + public static final boolean gtk_widget_is_focus(long widget) { lock.lock(); try { return _gtk_widget_is_focus(widget); @@ -8778,8 +8778,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_map(long /*int*/ widget); - public static final void gtk_widget_map(long /*int*/ widget) { + public static final native void _gtk_widget_map(long widget); + public static final void gtk_widget_map(long widget) { lock.lock(); try { _gtk_widget_map(widget); @@ -8796,9 +8796,9 @@ public class GTK extends OS { * @param minimum_baseline cast=(int *) * @param natural_baseline cast=(int *) */ - public static final native void _gtk_widget_measure(long /*int*/ widget, int orientation, int for_size, int[] minimum, int[] natural, int[] minimum_baseline, int[] natural_baseline); + public static final native void _gtk_widget_measure(long widget, int orientation, int for_size, int[] minimum, int[] natural, int[] minimum_baseline, int[] natural_baseline); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_widget_measure(long /*int*/ widget, int orientation, int for_size, int[] minimum, int[] natural, int[] minimum_baseline, int[] natural_baseline) { + public static final void gtk_widget_measure(long widget, int orientation, int for_size, int[] minimum, int[] natural, int[] minimum_baseline, int[] natural_baseline) { lock.lock(); try { _gtk_widget_measure(widget, orientation, for_size, minimum, natural, minimum_baseline, natural_baseline); @@ -8810,8 +8810,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param group_cycling cast=(gboolean) */ - public static final native boolean _gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling); - public static final boolean gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling) { + public static final native boolean _gtk_widget_mnemonic_activate(long widget, boolean group_cycling); + public static final boolean gtk_widget_mnemonic_activate(long widget, boolean group_cycling) { lock.lock(); try { return _gtk_widget_mnemonic_activate(widget, group_cycling); @@ -8822,9 +8822,9 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_widget_override_color(long /*int*/ widget, int state, GdkRGBA color); + public static final native void _gtk_widget_override_color(long widget, int state, GdkRGBA color); /** [GTK3; 3.16 deprecated, replaced]*/ - public static final void gtk_widget_override_color(long /*int*/ widget, int state, GdkRGBA color) { + public static final void gtk_widget_override_color(long widget, int state, GdkRGBA color) { lock.lock(); try { _gtk_widget_override_color(widget, state, color); @@ -8835,9 +8835,9 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_widget_override_background_color(long /*int*/ widget, int state, GdkRGBA color); + public static final native void _gtk_widget_override_background_color(long widget, int state, GdkRGBA color); /** [GTK3; 3.16 deprecated, replaced] */ - public static final void gtk_widget_override_background_color(long /*int*/ widget, int state, GdkRGBA color) { + public static final void gtk_widget_override_background_color(long widget, int state, GdkRGBA color) { lock.lock(); try { _gtk_widget_override_background_color(widget, state, color); @@ -8848,9 +8848,9 @@ public class GTK extends OS { /** * @method flags=dynamic */ - public static final native void _gtk_widget_override_font(long /*int*/ widget, long /*int*/ font); + public static final native void _gtk_widget_override_font(long widget, long font); /** [GTK3; 3.16 deprecated] */ - public static final void gtk_widget_override_font(long /*int*/ widget, long /*int*/ font) { + public static final void gtk_widget_override_font(long widget, long font) { lock.lock(); try { _gtk_widget_override_font(widget, font); @@ -8859,8 +8859,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_queue_resize(long /*int*/ widget); - public static final void gtk_widget_queue_resize(long /*int*/ widget) { + public static final native void _gtk_widget_queue_resize(long widget); + public static final void gtk_widget_queue_resize(long widget) { lock.lock(); try { _gtk_widget_queue_resize(widget); @@ -8869,8 +8869,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_realize(long /*int*/ widget); - public static final void gtk_widget_realize(long /*int*/ widget) { + public static final native void _gtk_widget_realize(long widget); + public static final void gtk_widget_realize(long widget) { lock.lock(); try { _gtk_widget_realize(widget); @@ -8884,8 +8884,8 @@ public class GTK extends OS { * @param accel_key cast=(guint) * @param accel_mods cast=(GdkModifierType) */ - public static final native void _gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods); - public static final void gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods) { + public static final native void _gtk_widget_remove_accelerator(long widget, long accel_group, int accel_key, int accel_mods); + public static final void gtk_widget_remove_accelerator(long widget, long accel_group, int accel_key, int accel_mods) { lock.lock(); try { _gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods); @@ -8898,9 +8898,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param new_parent cast=(GtkWidget *) */ - public static final native void _gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent); + public static final native void _gtk_widget_reparent(long widget, long new_parent); /** deprecated as of 3.14 */ - public static final void gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent) { + public static final void gtk_widget_reparent(long widget, long new_parent) { lock.lock(); try { _gtk_widget_reparent(widget, new_parent); @@ -8922,8 +8922,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param can_default cast=(gboolean) */ - public static final native void _gtk_widget_set_can_default(long /*int*/ widget, boolean can_default); - public static final void gtk_widget_set_can_default(long /*int*/ widget, boolean can_default) { + public static final native void _gtk_widget_set_can_default(long widget, boolean can_default); + public static final void gtk_widget_set_can_default(long widget, boolean can_default) { lock.lock(); try { _gtk_widget_set_can_default(widget,can_default) ; @@ -8932,8 +8932,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_queue_draw(long /*int*/ widget); - public static final void gtk_widget_queue_draw(long /*int*/ widget) { + public static final native void _gtk_widget_queue_draw(long widget); + public static final void gtk_widget_queue_draw(long widget) { lock.lock(); try { _gtk_widget_queue_draw(widget) ; @@ -8945,8 +8945,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param can_focus cast=(gboolean) */ - public static final native void _gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus); - public static final void gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus) { + public static final native void _gtk_widget_set_can_focus(long widget, boolean can_focus); + public static final void gtk_widget_set_can_focus(long widget, boolean can_focus) { lock.lock(); try { _gtk_widget_set_can_focus(widget,can_focus); @@ -8958,8 +8958,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param visible cast=(gboolean) */ - public static final native void _gtk_widget_set_visible(long /*int*/ widget, boolean visible); - public static final void gtk_widget_set_visible(long /*int*/ widget, boolean visible) { + public static final native void _gtk_widget_set_visible(long widget, boolean visible); + public static final void gtk_widget_set_visible(long widget, boolean visible) { lock.lock(); try { _gtk_widget_set_visible(widget, visible); @@ -8971,8 +8971,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param dir cast=(GtkTextDirection) */ - public static final native void _gtk_widget_set_direction(long /*int*/ widget, int dir); - public static final void gtk_widget_set_direction(long /*int*/ widget, int dir) { + public static final native void _gtk_widget_set_direction(long widget, int dir); + public static final void gtk_widget_set_direction(long widget, int dir) { lock.lock(); try { _gtk_widget_set_direction(widget, dir); @@ -8984,8 +8984,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param receives_default cast=(gboolean) */ - public static final native void _gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default); - public static final void gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default) { + public static final native void _gtk_widget_set_receives_default(long widget, boolean receives_default); + public static final void gtk_widget_set_receives_default(long widget, boolean receives_default) { lock.lock(); try { _gtk_widget_set_receives_default(widget, receives_default); @@ -8998,9 +8998,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param double_buffered cast=(gboolean) */ - public static final native void _gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered); + public static final native void _gtk_widget_set_double_buffered(long widget, boolean double_buffered); /** [GTK3 only; 3.14 deprecated] */ - public static final void gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered) { + public static final void gtk_widget_set_double_buffered(long widget, boolean double_buffered) { lock.lock(); try { _gtk_widget_set_double_buffered(widget, double_buffered); @@ -9013,8 +9013,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param val cast=(gboolean) */ - public static final native void _gtk_widget_set_focus_on_click(long /*int*/ widget, boolean val); - public static final void gtk_widget_set_focus_on_click(long /*int*/ widget, boolean val) { + public static final native void _gtk_widget_set_focus_on_click(long widget, boolean val); + public static final void gtk_widget_set_focus_on_click(long widget, boolean val) { lock.lock(); try { _gtk_widget_set_focus_on_click(widget, val); @@ -9026,8 +9026,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param name cast=(const char *) */ - public static final native void _gtk_widget_set_name(long /*int*/ widget, byte[] name); - public static final void gtk_widget_set_name(long /*int*/ widget, byte[] name) { + public static final native void _gtk_widget_set_name(long widget, byte[] name); + public static final void gtk_widget_set_name(long widget, byte[] name) { lock.lock(); try { _gtk_widget_set_name(widget, name); @@ -9039,8 +9039,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_set_opacity(long /*int*/ widget, double opacity); - public static final void gtk_widget_set_opacity(long /*int*/ widget, double opacity) { + public static final native void _gtk_widget_set_opacity(long widget, double opacity); + public static final void gtk_widget_set_opacity(long widget, double opacity) { lock.lock(); try { _gtk_widget_set_opacity(widget, opacity); @@ -9052,8 +9052,8 @@ public class GTK extends OS { * @method flags=dynamic * @param widget cast=(GtkWidget *) */ - public static final native double _gtk_widget_get_opacity(long /*int*/ widget); - public static final double gtk_widget_get_opacity(long /*int*/ widget) { + public static final native double _gtk_widget_get_opacity(long widget); + public static final double gtk_widget_get_opacity(long widget) { lock.lock(); try { return _gtk_widget_get_opacity(widget); @@ -9066,9 +9066,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param redraw cast=(gboolean) */ - public static final native void _gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw); + public static final native void _gtk_widget_set_redraw_on_allocate(long widget, boolean redraw); /** [GTK3 only] */ - public static final void gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw) { + public static final void gtk_widget_set_redraw_on_allocate(long widget, boolean redraw) { lock.lock(); try { _gtk_widget_set_redraw_on_allocate(widget, redraw); @@ -9080,8 +9080,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param sensitive cast=(gboolean) */ - public static final native void _gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive); - public static final void gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive) { + public static final native void _gtk_widget_set_sensitive(long widget, boolean sensitive); + public static final void gtk_widget_set_sensitive(long widget, boolean sensitive) { lock.lock(); try { _gtk_widget_set_sensitive(widget, sensitive); @@ -9094,8 +9094,8 @@ public class GTK extends OS { * @param width cast=(gint) * @param height cast=(gint) */ - public static final native void _gtk_widget_set_size_request(long /*int*/ widget, int width, int height); - public static final void gtk_widget_set_size_request(long /*int*/ widget, int width, int height) { + public static final native void _gtk_widget_set_size_request(long widget, int width, int height); + public static final void gtk_widget_set_size_request(long widget, int width, int height) { lock.lock(); try { _gtk_widget_set_size_request(widget, width, height); @@ -9104,8 +9104,8 @@ public class GTK extends OS { } } /** @param widget cast=(GtkWidget *) */ - public static final native void _gtk_widget_show(long /*int*/ widget); - public static final void gtk_widget_show(long /*int*/ widget) { + public static final native void _gtk_widget_show(long widget); + public static final void gtk_widget_show(long widget) { lock.lock(); try { _gtk_widget_show(widget); @@ -9118,9 +9118,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param allocation cast=(GtkAllocation *),flags=no_out */ - public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation); + public static final native void _gtk_widget_size_allocate(long widget, GtkAllocation allocation); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation) { + public static final void gtk_widget_size_allocate(long widget, GtkAllocation allocation) { lock.lock(); try { _gtk_widget_size_allocate(widget, allocation); @@ -9133,9 +9133,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param allocation cast=(GtkAllocation *),flags=no_out */ - public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation, int baseline); + public static final native void _gtk_widget_size_allocate(long widget, GtkAllocation allocation, int baseline); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation, int baseline) { + public static final void gtk_widget_size_allocate(long widget, GtkAllocation allocation, int baseline) { lock.lock(); try { _gtk_widget_size_allocate(widget, allocation, baseline); @@ -9148,9 +9148,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param allocation cast=(GtkAllocation *),flags=no_out */ - public static final native void _gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation); + public static final native void _gtk_widget_set_allocation(long widget, GtkAllocation allocation); /** [GTK3 only] */ - public static final void gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation) { + public static final void gtk_widget_set_allocation(long widget, GtkAllocation allocation) { lock.lock(); try { _gtk_widget_set_allocation(widget, allocation); @@ -9163,9 +9163,9 @@ public class GTK extends OS { * @param property_name cast=(const gchar *) * @param terminator cast=(const gchar *),flags=sentinel */ - public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator); + public static final native void _gtk_widget_style_get(long widget, byte[] property_name, int[] value, long terminator); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator) { + public static final void gtk_widget_style_get(long widget, byte[] property_name, int[] value, long terminator) { lock.lock(); try { _gtk_widget_style_get(widget, property_name, value, terminator); @@ -9178,9 +9178,9 @@ public class GTK extends OS { * @param property_name cast=(const gchar *) * @param terminator cast=(const gchar *),flags=sentinel */ - public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator); + public static final native void _gtk_widget_style_get(long widget, byte[] property_name, long[] value, long terminator); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator) { + public static final void gtk_widget_style_get(long widget, byte[] property_name, long[] value, long terminator) { lock.lock(); try { _gtk_widget_style_get(widget, property_name, value, terminator); @@ -9194,8 +9194,8 @@ public class GTK extends OS { * @param dest_x cast=(gint *) * @param dest_y cast=(gint *) */ - public static final native boolean _gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y); - public static final boolean gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) { + public static final native boolean _gtk_widget_translate_coordinates(long src_widget, long dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y); + public static final boolean gtk_widget_translate_coordinates(long src_widget, long dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) { lock.lock(); try { return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y); @@ -9204,8 +9204,8 @@ public class GTK extends OS { } } /** @param window cast=(GtkWindow *) */ - public static final native boolean _gtk_window_activate_default(long /*int*/ window); - public static final boolean gtk_window_activate_default(long /*int*/ window) { + public static final native boolean _gtk_window_activate_default(long window); + public static final boolean gtk_window_activate_default(long window) { lock.lock(); try { return _gtk_window_activate_default(window); @@ -9217,8 +9217,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param accel_group cast=(GtkAccelGroup *) */ - public static final native void _gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group); - public static final void gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group) { + public static final native void _gtk_window_add_accel_group(long window, long accel_group); + public static final void gtk_window_add_accel_group(long window, long accel_group) { lock.lock(); try { _gtk_window_add_accel_group(window, accel_group); @@ -9227,8 +9227,8 @@ public class GTK extends OS { } } /** @param handle cast=(GtkWindow *) */ - public static final native void _gtk_window_deiconify(long /*int*/ handle); - public static final void gtk_window_deiconify(long /*int*/ handle) { + public static final native void _gtk_window_deiconify(long handle); + public static final void gtk_window_deiconify(long handle) { lock.lock(); try { _gtk_window_deiconify(handle); @@ -9237,8 +9237,8 @@ public class GTK extends OS { } } /** @param window cast=(GtkWindow *) */ - public static final native long /*int*/ _gtk_window_get_focus(long /*int*/ window); - public static final long /*int*/ gtk_window_get_focus(long /*int*/ window) { + public static final native long _gtk_window_get_focus(long window); + public static final long gtk_window_get_focus(long window) { lock.lock(); try { return _gtk_window_get_focus(window); @@ -9249,8 +9249,8 @@ public class GTK extends OS { /** * @param window cast=(GtkWindow *) */ - public static final native long /*int*/ _gtk_window_get_group(long /*int*/ window); - public static final long /*int*/ gtk_window_get_group(long /*int*/ window) { + public static final native long _gtk_window_get_group(long window); + public static final long gtk_window_get_group(long window) { lock.lock(); try { return _gtk_window_get_group(window); @@ -9259,8 +9259,8 @@ public class GTK extends OS { } } /** @param window cast=(GtkWindow *) */ - public static final native long /*int*/ _gtk_window_get_icon_list(long /*int*/ window); - public static final long /*int*/ gtk_window_get_icon_list(long /*int*/ window) { + public static final native long _gtk_window_get_icon_list(long window); + public static final long gtk_window_get_icon_list(long window) { lock.lock(); try { return _gtk_window_get_icon_list(window); @@ -9269,8 +9269,8 @@ public class GTK extends OS { } } /** @param window cast=(GtkWindow *) */ - public static final native boolean _gtk_window_get_modal(long /*int*/ window); - public static final boolean gtk_window_get_modal(long /*int*/ window) { + public static final native boolean _gtk_window_get_modal(long window); + public static final boolean gtk_window_get_modal(long window) { lock.lock(); try { return _gtk_window_get_modal(window); @@ -9279,8 +9279,8 @@ public class GTK extends OS { } } /** @param window cast=(GtkWindow *) */ - public static final native int _gtk_window_get_mnemonic_modifier(long /*int*/ window); - public static final int gtk_window_get_mnemonic_modifier(long /*int*/ window) { + public static final native int _gtk_window_get_mnemonic_modifier(long window); + public static final int gtk_window_get_mnemonic_modifier(long window) { lock.lock(); try { return _gtk_window_get_mnemonic_modifier(window); @@ -9293,8 +9293,8 @@ public class GTK extends OS { * @param x cast=(gint *) * @param y cast=(gint *) */ - public static final native void _gtk_window_get_position(long /*int*/ handle, int[] x, int[] y); - public static final void gtk_window_get_position(long /*int*/ handle, int[] x, int[] y) { + public static final native void _gtk_window_get_position(long handle, int[] x, int[] y); + public static final void gtk_window_get_position(long handle, int[] x, int[] y) { lock.lock(); try { _gtk_window_get_position(handle, x, y); @@ -9306,8 +9306,8 @@ public class GTK extends OS { * @param group cast=(GtkWindowGroup*) * @param window cast=(GtkWindow*) */ - public static final native void _gtk_window_group_add_window(long /*int*/ group, long /*int*/ window); - public static final void gtk_window_group_add_window(long /*int*/ group, long /*int*/ window) { + public static final native void _gtk_window_group_add_window(long group, long window); + public static final void gtk_window_group_add_window(long group, long window) { lock.lock(); try { _gtk_window_group_add_window(group, window); @@ -9319,8 +9319,8 @@ public class GTK extends OS { * @param group cast=(GtkWindowGroup*) * @param window cast=(GtkWindow*) */ - public static final native void _gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window); - public static final void gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window) { + public static final native void _gtk_window_group_remove_window(long group, long window); + public static final void gtk_window_group_remove_window(long group, long window) { lock.lock(); try { _gtk_window_group_remove_window(group, window); @@ -9328,8 +9328,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_window_group_new(); - public static final long /*int*/ gtk_window_group_new() { + public static final native long _gtk_window_group_new(); + public static final long gtk_window_group_new() { lock.lock(); try { return _gtk_window_group_new(); @@ -9338,8 +9338,8 @@ public class GTK extends OS { } } /** @param handle cast=(GtkWindow *) */ - public static final native boolean _gtk_window_is_active(long /*int*/ handle); - public static final boolean gtk_window_is_active(long /*int*/ handle) { + public static final native boolean _gtk_window_is_active(long handle); + public static final boolean gtk_window_is_active(long handle) { lock.lock(); try { return _gtk_window_is_active(handle); @@ -9348,8 +9348,8 @@ public class GTK extends OS { } } /** @param handle cast=(GtkWindow *) */ - public static final native void _gtk_window_iconify(long /*int*/ handle); - public static final void gtk_window_iconify(long /*int*/ handle) { + public static final native void _gtk_window_iconify(long handle); + public static final void gtk_window_iconify(long handle) { lock.lock(); try { _gtk_window_iconify(handle); @@ -9357,8 +9357,8 @@ public class GTK extends OS { lock.unlock(); } } - public static final native long /*int*/ _gtk_window_list_toplevels (); - public static final long /*int*/ gtk_window_list_toplevels () { + public static final native long _gtk_window_list_toplevels (); + public static final long gtk_window_list_toplevels () { lock.lock(); try { return _gtk_window_list_toplevels (); @@ -9367,8 +9367,8 @@ public class GTK extends OS { } } /** @param handle cast=(GtkWindow *) */ - public static final native void _gtk_window_maximize(long /*int*/ handle); - public static final void gtk_window_maximize(long /*int*/ handle) { + public static final native void _gtk_window_maximize(long handle); + public static final void gtk_window_maximize(long handle) { lock.lock(); try { _gtk_window_maximize(handle); @@ -9377,8 +9377,8 @@ public class GTK extends OS { } } /** @param handle cast=(GtkWindow *) */ - public static final native void _gtk_window_fullscreen(long /*int*/ handle); - public static final void gtk_window_fullscreen(long /*int*/ handle) { + public static final native void _gtk_window_fullscreen(long handle); + public static final void gtk_window_fullscreen(long handle) { lock.lock(); try { _gtk_window_fullscreen(handle); @@ -9387,8 +9387,8 @@ public class GTK extends OS { } } /** @param handle cast=(GtkWindow *) */ - public static final native void _gtk_window_unfullscreen(long /*int*/ handle); - public static final void gtk_window_unfullscreen(long /*int*/ handle) { + public static final native void _gtk_window_unfullscreen(long handle); + public static final void gtk_window_unfullscreen(long handle) { lock.lock(); try { _gtk_window_unfullscreen(handle); @@ -9401,8 +9401,8 @@ public class GTK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native void _gtk_window_move(long /*int*/ handle, int x, int y); - public static final void gtk_window_move(long /*int*/ handle, int x, int y) { + public static final native void _gtk_window_move(long handle, int x, int y); + public static final void gtk_window_move(long handle, int x, int y) { lock.lock(); try { _gtk_window_move(handle, x, y); @@ -9411,8 +9411,8 @@ public class GTK extends OS { } } /** @param type cast=(GtkWindowType) */ - public static final native long /*int*/ _gtk_window_new(int type); - public static final long /*int*/ gtk_window_new(int type) { + public static final native long _gtk_window_new(int type); + public static final long gtk_window_new(int type) { lock.lock(); try { return _gtk_window_new(type); @@ -9424,8 +9424,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param accel_group cast=(GtkAccelGroup *) */ - public static final native void _gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group); - public static final void gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group) { + public static final native void _gtk_window_remove_accel_group(long window, long accel_group); + public static final void gtk_window_remove_accel_group(long window, long accel_group) { lock.lock(); try { _gtk_window_remove_accel_group(window, accel_group); @@ -9438,8 +9438,8 @@ public class GTK extends OS { * @param x cast=(gint) * @param y cast=(gint) */ - public static final native void _gtk_window_resize(long /*int*/ handle, int x, int y); - public static final void gtk_window_resize(long /*int*/ handle, int x, int y) { + public static final native void _gtk_window_resize(long handle, int x, int y); + public static final void gtk_window_resize(long handle, int x, int y) { lock.lock(); try { _gtk_window_resize(handle, x, y); @@ -9452,8 +9452,8 @@ public class GTK extends OS { * @param width cast=(gint *) * @param height cast=(gint *) */ - public static final native void _gtk_window_get_size(long /*int*/ handle, int[] width, int[] height); - public static final void gtk_window_get_size(long /*int*/ handle, int[] width, int[] height) { + public static final native void _gtk_window_get_size(long handle, int[] width, int[] height); + public static final void gtk_window_get_size(long handle, int[] width, int[] height) { lock.lock(); try { _gtk_window_get_size(handle, width, height); @@ -9465,8 +9465,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param attach_widget cast=(GtkWidget *) */ - public static final native void _gtk_window_set_attached_to(long /*int*/ window, long /*int*/ attach_widget); - public static final void gtk_window_set_attached_to(long /*int*/ window, long /*int*/ attach_widget) { + public static final native void _gtk_window_set_attached_to(long window, long attach_widget); + public static final void gtk_window_set_attached_to(long window, long attach_widget) { lock.lock(); try { _gtk_window_set_attached_to(window, attach_widget); @@ -9478,8 +9478,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param widget cast=(GtkWidget *) */ - public static final native void _gtk_window_set_default(long /*int*/ window, long /*int*/ widget); - public static final void gtk_window_set_default(long /*int*/ window, long /*int*/ widget) { + public static final native void _gtk_window_set_default(long window, long widget); + public static final void gtk_window_set_default(long window, long widget) { lock.lock(); try { _gtk_window_set_default(window, widget); @@ -9491,8 +9491,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param decorated cast=(gboolean) */ - public static final native void _gtk_window_set_decorated(long /*int*/ window, boolean decorated); - public static final void gtk_window_set_decorated(long /*int*/ window, boolean decorated) { + public static final native void _gtk_window_set_decorated(long window, boolean decorated); + public static final void gtk_window_set_decorated(long window, boolean decorated) { lock.lock(); try { _gtk_window_set_decorated(window, decorated); @@ -9504,8 +9504,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param setting cast=(gboolean) */ - public static final native void _gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting); - public static final void gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting) { + public static final native void _gtk_window_set_destroy_with_parent(long window, boolean setting); + public static final void gtk_window_set_destroy_with_parent(long window, boolean setting) { lock.lock(); try { _gtk_window_set_destroy_with_parent(window, setting); @@ -9518,9 +9518,9 @@ public class GTK extends OS { * @param geometry_widget cast=(GtkWidget *) * @param geometry flags=no_out */ - public static final native void _gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask); + public static final native void _gtk_window_set_geometry_hints(long window, long geometry_widget, GdkGeometry geometry, int geom_mask); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask) { + public static final void gtk_window_set_geometry_hints(long window, long geometry_widget, GdkGeometry geometry, int geom_mask) { lock.lock(); try { _gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask); @@ -9532,8 +9532,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param list cast=(GList *) */ - public static final native void _gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list); - public static final void gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list) { + public static final native void _gtk_window_set_icon_list(long window, long list); + public static final void gtk_window_set_icon_list(long window, long list) { lock.lock(); try { _gtk_window_set_icon_list(window, list); @@ -9545,8 +9545,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param setting cast=(gboolean) */ - public static final native void _gtk_window_set_keep_above(long /*int*/ window, boolean setting); - public static final void gtk_window_set_keep_above(long /*int*/ window, boolean setting) { + public static final native void _gtk_window_set_keep_above(long window, boolean setting); + public static final void gtk_window_set_keep_above(long window, boolean setting) { lock.lock(); try { _gtk_window_set_keep_above(window, setting); @@ -9558,8 +9558,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param modal cast=(gboolean) */ - public static final native void _gtk_window_set_modal(long /*int*/ window, boolean modal); - public static final void gtk_window_set_modal(long /*int*/ window, boolean modal) { + public static final native void _gtk_window_set_modal(long window, boolean modal); + public static final void gtk_window_set_modal(long window, boolean modal) { lock.lock(); try { _gtk_window_set_modal(window, modal); @@ -9571,8 +9571,8 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param tip_text cast=(const gchar *) */ - public static final native void _gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text); - public static final void gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text) { + public static final native void _gtk_widget_set_tooltip_text(long widget, byte[] tip_text); + public static final void gtk_widget_set_tooltip_text(long widget, byte[] tip_text) { lock.lock(); try { _gtk_widget_set_tooltip_text(widget, tip_text); @@ -9584,9 +9584,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param parent_window cast=(GdkWindow *) */ - public static final native void _gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window); + public static final native void _gtk_widget_set_parent_window(long widget, long parent_window); /** [GTK3 only, if-def'd in os.h] */ - public static final void gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window) { + public static final void gtk_widget_set_parent_window(long widget, long parent_window) { lock.lock(); try { _gtk_widget_set_parent_window(widget, parent_window); @@ -9598,9 +9598,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param parent_surface cast=(GdkSurface *) */ - public static final native void _gtk_widget_set_parent_surface(long /*int*/ widget, long /*int*/ parent_surface); + public static final native void _gtk_widget_set_parent_surface(long widget, long parent_surface); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_widget_set_parent_surface(long /*int*/ widget, long /*int*/ parent_surface) { + public static final void gtk_widget_set_parent_surface(long widget, long parent_surface) { lock.lock(); try { _gtk_widget_set_parent_surface(widget, parent_surface); @@ -9612,8 +9612,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param resizable cast=(gboolean) */ - public static final native void _gtk_window_set_resizable(long /*int*/ window, boolean resizable); - public static final void gtk_window_set_resizable(long /*int*/ window, boolean resizable) { + public static final native void _gtk_window_set_resizable(long window, boolean resizable); + public static final void gtk_window_set_resizable(long window, boolean resizable) { lock.lock(); try { _gtk_window_set_resizable(window, resizable); @@ -9625,8 +9625,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param title cast=(const gchar *) */ - public static final native void _gtk_window_set_title(long /*int*/ window, byte[] title); - public static final void gtk_window_set_title(long /*int*/ window, byte[] title) { + public static final native void _gtk_window_set_title(long window, byte[] title); + public static final void gtk_window_set_title(long window, byte[] title) { lock.lock(); try { _gtk_window_set_title(window, title); @@ -9638,8 +9638,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param skips_taskbar cast=(gboolean) */ - public static final native void _gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar); - public static final void gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar) { + public static final native void _gtk_window_set_skip_taskbar_hint(long window, boolean skips_taskbar); + public static final void gtk_window_set_skip_taskbar_hint(long window, boolean skips_taskbar) { lock.lock(); try { _gtk_window_set_skip_taskbar_hint(window, skips_taskbar); @@ -9648,8 +9648,8 @@ public class GTK extends OS { } } /** @param window cast=(GtkWindow *) */ - public static final native void _gtk_window_set_type_hint(long /*int*/ window, int hint); - public static final void gtk_window_set_type_hint(long /*int*/ window, int hint) { + public static final native void _gtk_window_set_type_hint(long window, int hint); + public static final void gtk_window_set_type_hint(long window, int hint) { lock.lock(); try { _gtk_window_set_type_hint(window, hint); @@ -9661,8 +9661,8 @@ public class GTK extends OS { * @param window cast=(GtkWindow *) * @param parent cast=(GtkWindow *) */ - public static final native void _gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent); - public static final void gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent) { + public static final native void _gtk_window_set_transient_for(long window, long parent); + public static final void gtk_window_set_transient_for(long window, long parent) { lock.lock(); try { _gtk_window_set_transient_for(window, parent); @@ -9671,8 +9671,8 @@ public class GTK extends OS { } } /** @param handle cast=(GtkWindow *) */ - public static final native void _gtk_window_unmaximize(long /*int*/ handle); - public static final void gtk_window_unmaximize(long /*int*/ handle) { + public static final native void _gtk_window_unmaximize(long handle); + public static final void gtk_window_unmaximize(long handle) { lock.lock(); try { _gtk_window_unmaximize(handle); @@ -9681,8 +9681,8 @@ public class GTK extends OS { } } /** @method flags=dynamic */ - public static final native long /*int*/ _gtk_printer_option_widget_get_type(); - public static final long /*int*/ gtk_printer_option_widget_get_type() { + public static final native long _gtk_printer_option_widget_get_type(); + public static final long gtk_printer_option_widget_get_type() { lock.lock(); try { return _gtk_printer_option_widget_get_type(); @@ -9695,9 +9695,9 @@ public class GTK extends OS { * @param widget cast=(GtkWidget *) * @param region cast=(cairo_region_t *) */ - public static final native void _gtk_widget_shape_combine_region(long /*int*/ widget, long /*int*/ region); + public static final native void _gtk_widget_shape_combine_region(long widget, long region); /** [GTK3 only] */ - public static final void gtk_widget_shape_combine_region(long /*int*/ widget, long /*int*/ region) { + public static final void gtk_widget_shape_combine_region(long widget, long region) { lock.lock(); try { _gtk_widget_shape_combine_region(widget,region); @@ -9710,9 +9710,9 @@ public class GTK extends OS { * @param child cast=(GtkWidget *) * @param snapshot cast=(GtkSnapshot *) */ - public static final native void _gtk_widget_snapshot_child(long /*int*/ widget, long /*int*/ child, long /*int*/ snapshot); + public static final native void _gtk_widget_snapshot_child(long widget, long child, long snapshot); /** [GTK4 only, if-def'd in os.h] */ - public static final void gtk_widget_snapshot_child(long /*int*/ widget, long /*int*/ child, long /*int*/ snapshot) { + public static final void gtk_widget_snapshot_child(long widget, long child, long snapshot) { lock.lock(); try { _gtk_widget_snapshot_child(widget,child,snapshot); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java index 000a295916..514538cf10 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java @@ -19,22 +19,22 @@ public class GTypeInfo { /** @field cast=(guint16) */ public short class_size; /** @field cast=(GBaseInitFunc) */ - public long /*int*/ base_init; + public long base_init; /** @field cast=(GBaseFinalizeFunc) */ - public long /*int*/ base_finalize; + public long base_finalize; /** @field cast=(GClassInitFunc) */ - public long /*int*/ class_init; + public long class_init; /** @field cast=(GClassFinalizeFunc) */ - public long /*int*/ class_finalize; + public long class_finalize; /** @field cast=(gconstpointer) */ - public long /*int*/ class_data; + public long class_data; /** @field cast=(guint16) */ public short instance_size; /** @field cast=(guint16) */ public short n_preallocs; /** @field cast=(GInstanceInitFunc) */ - public long /*int*/ instance_init; + public long instance_init; /** @field cast=(GTypeValueTable *) */ - public long /*int*/ value_table; + public long value_table; public static final int sizeof = OS.GTypeInfo_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java index 06a8568afb..18e9b9a654 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java @@ -19,7 +19,7 @@ public class GTypeQuery { /** @field cast=(GType) */ public int type; /** @field cast=(const gchar *) */ - public long /*int*/ type_name; + public long type_name; /** @field cast=(guint) */ public int class_size; /** @field cast=(guint) */ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java index e13ee4c88c..dbe4bc12ec 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class GdkEventAny extends GdkEvent { /** @field cast=(GdkWindow *) */ - public long /*int*/ window; + public long window; /** @field cast=(gint8) */ public byte send_event; public static final int sizeof = GDK.GdkEventAny_sizeof(); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java index e07d9f7051..ef08a3c918 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class GdkEventButton extends GdkEvent { /** @field cast=(GdkWindow *) */ - public long /*int*/ window; + public long window; /** @field cast=(gint8) */ public byte send_event; /** @field cast=(guint32) */ @@ -27,13 +27,13 @@ public class GdkEventButton extends GdkEvent { /** @field cast=(gdouble) */ public double y; /** @field cast=(gdouble *) */ - public long /*int*/ axes; + public long axes; /** @field cast=(guint) */ public int state; /** @field cast=(guint) */ public int button; /** @field cast=(GdkDevice *) */ - public long /*int*/ device; + public long device; /** @field cast=(gdouble) */ public double x_root; /** @field cast=(gdouble) */ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java index 9a58331525..2e25d4a024 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java @@ -17,11 +17,11 @@ package org.eclipse.swt.internal.gtk; public class GdkEventCrossing extends GdkEvent { /** @field cast=(GdkWindow *) */ - public long /*int*/ window; + public long window; /** @field cast=(gint8) */ public byte send_event; /** @field cast=(GdkWindow *) */ - public long /*int*/ subwindow; + public long subwindow; public int time; public double x; public double y; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java index 8728f22930..59741dfec7 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class GdkEventFocus extends GdkEvent { /** @field cast=(GdkWindow *) */ - public long /*int*/ window; + public long window; /** @field cast=(gint8) */ public byte send_event; /** @field cast=(gint16) */ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java index d120a92db0..0e9767477c 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class GdkEventKey extends GdkEvent { /** @field cast=(GdkWindow *) */ - public long /*int*/ window; + public long window; /** @field cast=(gint8) */ public byte send_event; /** @field cast=(guint32) */ @@ -29,7 +29,7 @@ public class GdkEventKey extends GdkEvent { /** @field cast=(gint) */ public int length; /** @field cast=(gchar *) */ - public long /*int*/ string; + public long string; /** @field cast=(guint16) */ public short hardware_keycode; /** @field cast=(guint8) */ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java index 72bef1d3db..ed2b76ad8c 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class GdkEventMotion extends GdkEvent { /** @field cast=(GdkWindow *) */ - public long /*int*/ window; + public long window; /** @field cast=(gint8) */ public byte send_event; /** @field cast=(guint32) */ @@ -27,13 +27,13 @@ public class GdkEventMotion extends GdkEvent { /** @field cast=(gdouble) */ public double y; /** @field cast=(gdouble *) */ - public long /*int*/ axes; + public long axes; /** @field cast=(guint) */ public int state; /** @field cast=(gint16) */ public short is_hint; /** @field cast=(GdkDevice *) */ - public long /*int*/ device; + public long device; /** @field cast=(gdouble) */ public double x_root; /** @field cast=(gdouble) */ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java index ecd325f37b..2eb6886e09 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class GdkEventWindowState extends GdkEvent { /** @field cast=(GdkWindow *) */ - public long /*int*/ window; + public long window; public byte send_event; public int changed_mask; public int new_window_state; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java index e66f33dd9e..6ea862a85e 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java @@ -17,21 +17,21 @@ package org.eclipse.swt.internal.gtk; public class GdkWindowAttr { /** @field cast=(gchar *) */ - public long /*int*/ title; + public long title; public int event_mask; public int x, y; public int width; public int height; public int wclass; /** @field cast=(GdkVisual *) */ - public long /*int*/ visual; + public long visual; public int window_type; /** @field cast=(GdkCursor *) */ - public long /*int*/ cursor; + public long cursor; /** @field cast=(gchar *) */ - public long /*int*/ wmclass_name; + public long wmclass_name; /** @field cast=(gchar *) */ - public long /*int*/ wmclass_class; + public long wmclass_class; public boolean override_redirect; public static final int sizeof = GDK.GdkWindowAttr_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/Graphene.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/Graphene.java index 276b1d66de..0ec033ea11 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/Graphene.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/Graphene.java @@ -22,9 +22,9 @@ package org.eclipse.swt.internal.gtk; */ public class Graphene extends OS { - public static final native long /*int*/ _graphene_rect_alloc(); + public static final native long _graphene_rect_alloc(); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ graphene_rect_alloc() { + public static final long graphene_rect_alloc() { lock.lock(); try { return _graphene_rect_alloc(); @@ -35,9 +35,9 @@ public class Graphene extends OS { /** * @param rectangle cast=(graphene_rect_t *) */ - public static final native void _graphene_rect_free(long /*int*/ rectangle); + public static final native void _graphene_rect_free(long rectangle); /** [GTK4 only, if-def'd in os.h] */ - public static final void graphene_rect_free(long /*int*/ rectangle) { + public static final void graphene_rect_free(long rectangle) { lock.lock(); try { _graphene_rect_free(rectangle); @@ -48,9 +48,9 @@ public class Graphene extends OS { /** * @param rectangle cast=(graphene_rect_t *) */ - public static final native long /*int*/ _graphene_rect_init(long /*int*/ rectangle, float x, float y, float width, float height); + public static final native long _graphene_rect_init(long rectangle, float x, float y, float width, float height); /** [GTK4 only, if-def'd in os.h] */ - public static final long /*int*/ graphene_rect_init(long /*int*/ rectangle, float x, float y, float width, float height) { + public static final long graphene_rect_init(long rectangle, float x, float y, float width, float height) { lock.lock(); try { return _graphene_rect_init(rectangle, x, y, width, height); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java index 410f91e202..335e5f0dc3 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java @@ -17,9 +17,9 @@ package org.eclipse.swt.internal.gtk; public class GtkCellRendererClass { /** @field cast=(void(*)()),exclude=#ifndef GTK4 */ - public long /*int*/ render; + public long render; /** @field cast=(void(*)()),exclude=#ifdef GTK4 */ - public long /*int*/ snapshot; + public long snapshot; /** @field cast=(void(*)()) */ - public long /*int*/ get_preferred_width; + public long get_preferred_width; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java index 24d60bcb58..8785cbae5a 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class GtkTargetEntry { /** @field cast=(gchar *) */ - public long /*int*/ target; + public long target; /** @field cast=(guint) */ public int flags; /** @field cast=(guint) */ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java index 64b25b6dab..ce10a8d73b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java @@ -17,9 +17,9 @@ package org.eclipse.swt.internal.gtk; public class GtkWidgetClass extends GObjectClass { /** @field cast=(void(*)()) */ - public long /*int*/ map; + public long map; /** @field cast=(void(*)()) */ - public long /*int*/ size_allocate; + public long size_allocate; /** @field cast=(void(*)()),exclude=#ifdef GTK4 */ - public long /*int*/ snapshot; + public long snapshot; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 2a383884fc..63a9d82224 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -32,18 +32,18 @@ import org.eclipse.swt.internal.*; // boolean -> int ex setenv // gboolean -> boolean // -// Pointers: (the /*int*/ tells 32bit linux to use int instead of long. -// gpointer -> long /*int*/ -// void * -> long /*int*/ # C pointers (*) are normally long /*int*/ +// Pointers: +// gpointer -> long +// void * -> long // // Strings: -// gchar * -> long /*int*/ +// gchar * -> long // const char * -> byte[] ex setenv // const gchar* -> byte[] ex g_log_remove_handler // // Special types: // GQuark -> int -// GError ** -> long /*int*/[] ex g_filename_to_uri +// GError ** -> long [] ex g_filename_to_uri /** @@ -64,7 +64,7 @@ public class OS extends C { IsLinux = isLinux; IsWin32 = isWin32; byte[] buffer = new byte[4]; - long /*int*/ ptr = C.malloc(4); + long ptr = C.malloc(4); C.memmove(ptr, new int[]{1}, 4); C.memmove(buffer, ptr, 1); C.free(ptr); @@ -122,7 +122,7 @@ public class OS extends C { public static String getEnvironmentalVariable (String envVarName) { String envVarValue = null; - long /*int*/ ptr = C.getenv(ascii(envVarName)); + long ptr = C.getenv(ascii(envVarName)); if (ptr != 0) { int length = C.strlen(ptr); byte[] buffer = new byte[length]; @@ -459,27 +459,27 @@ public class OS extends C { /** @method flags=no_gen * @category custom */ - public static final native long /*int*/ pangoLayoutNewProc_CALLBACK(long /*int*/ func); + public static final native long pangoLayoutNewProc_CALLBACK(long func); /** @method flags=no_gen * @category custom */ - public static final native long /*int*/ pangoFontFamilyNewProc_CALLBACK(long /*int*/ func); + public static final native long pangoFontFamilyNewProc_CALLBACK(long func); /** @method flags=no_gen * @category custom */ - public static final native long /*int*/ pangoFontFaceNewProc_CALLBACK(long /*int*/ func); + public static final native long pangoFontFaceNewProc_CALLBACK(long func); /** @method flags=no_gen * @category custom */ - public static final native long /*int*/ printerOptionWidgetNewProc_CALLBACK(long /*int*/ func); + public static final native long printerOptionWidgetNewProc_CALLBACK(long func); /** @method flags=no_gen * @category custom */ - public static final native long /*int*/ imContextNewProc_CALLBACK(long /*int*/ func); + public static final native long imContextNewProc_CALLBACK(long func); /** @method flags=no_gen * @category custom */ - public static final native long /*int*/ imContextLast(); + public static final native long imContextLast(); /** @method flags=no_gen * @category custom */ @@ -509,8 +509,8 @@ public class OS extends C { } /** @category custom */ - public static final native long /*int*/ _swt_fixed_get_type(); - public static final long /*int*/ swt_fixed_get_type() { + public static final native long _swt_fixed_get_type(); + public static final long swt_fixed_get_type() { lock.lock(); try { return _swt_fixed_get_type(); @@ -520,8 +520,8 @@ public class OS extends C { } /** @category custom */ - public static final native long /*int*/ _swt_fixed_accessible_get_type(); - public static final long /*int*/ swt_fixed_accessible_get_type() { + public static final native long _swt_fixed_accessible_get_type(); + public static final long swt_fixed_accessible_get_type() { lock.lock(); try { return _swt_fixed_accessible_get_type(); @@ -535,8 +535,8 @@ public class OS extends C { * @param to_map cast=(GtkWidget *) * @category custom */ - public static final native void _swt_fixed_accessible_register_accessible(long /*int*/ obj, boolean is_native, long /*int*/ to_map); - public static final void swt_fixed_accessible_register_accessible(long /*int*/ obj, boolean is_native, long /*int*/ to_map) { + public static final native void _swt_fixed_accessible_register_accessible(long obj, boolean is_native, long to_map); + public static final void swt_fixed_accessible_register_accessible(long obj, boolean is_native, long to_map) { lock.lock(); try { _swt_fixed_accessible_register_accessible(obj, is_native, to_map); @@ -550,8 +550,8 @@ public class OS extends C { * @param sibling cast=(GtkWidget*) * @category custom */ - public static final native void _swt_fixed_restack(long /*int*/ fixed, long /*int*/ widget, long /*int*/ sibling, boolean above); - public static final void swt_fixed_restack(long /*int*/ fixed, long /*int*/ widget, long /*int*/ sibling, boolean above) { + public static final native void _swt_fixed_restack(long fixed, long widget, long sibling, boolean above); + public static final void swt_fixed_restack(long fixed, long widget, long sibling, boolean above) { lock.lock(); try { _swt_fixed_restack(fixed, widget, sibling, above); @@ -564,8 +564,8 @@ public class OS extends C { * @param widget cast=(GtkWidget*) * @category custom */ - public static final native void _swt_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y); - public static final void swt_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y) { + public static final native void _swt_fixed_move(long fixed, long widget, int x, int y); + public static final void swt_fixed_move(long fixed, long widget, int x, int y) { lock.lock(); try { _swt_fixed_move(fixed, widget, x, y); @@ -578,8 +578,8 @@ public class OS extends C { * @param widget cast=(GtkWidget*) * @category custom */ - public static final native void _swt_fixed_resize(long /*int*/ fixed, long /*int*/ widget, int width, int height); - public static final void swt_fixed_resize(long /*int*/ fixed, long /*int*/ widget, int width, int height) { + public static final native void _swt_fixed_resize(long fixed, long widget, int width, int height); + public static final void swt_fixed_resize(long fixed, long widget, int width, int height) { lock.lock(); try { _swt_fixed_resize(fixed, widget, width, height); @@ -591,9 +591,9 @@ public class OS extends C { /** @param str cast=(const gchar *) * @category custom */ - public static final native long /*int*/ _g_utf16_offset_to_pointer(long /*int*/ str, long /*int*/ offset); + public static final native long _g_utf16_offset_to_pointer(long str, long offset); /** Custom version of g_utf8_pointer_to_offset */ - public static final long /*int*/ g_utf16_offset_to_pointer(long /*int*/ str, long /*int*/ offset) { + public static final long g_utf16_offset_to_pointer(long str, long offset) { lock.lock(); try { return _g_utf16_offset_to_pointer(str, offset); @@ -607,9 +607,9 @@ public class OS extends C { * @param pos cast=(const gchar *) * @category custom */ - public static final native long /*int*/ _g_utf16_pointer_to_offset(long /*int*/ str, long /*int*/ pos); + public static final native long _g_utf16_pointer_to_offset(long str, long pos); /** Custom version of g_utf8_pointer_to_offset */ - public static final long /*int*/ g_utf16_pointer_to_offset(long /*int*/ str, long /*int*/ pos) { + public static final long g_utf16_pointer_to_offset(long str, long pos) { lock.lock(); try { return _g_utf16_pointer_to_offset(str, pos); @@ -620,9 +620,9 @@ public class OS extends C { /** @param str cast=(const gchar *) * @category custom */ - public static final native long /*int*/ _g_utf16_strlen(long /*int*/ str, long /*int*/ max); + public static final native long _g_utf16_strlen(long str, long max); /** custom version of g_utf8 for 16 bit */ - public static final long /*int*/ g_utf16_strlen(long /*int*/ str, long /*int*/ max) { + public static final long g_utf16_strlen(long str, long max) { lock.lock(); try { return _g_utf16_strlen(str, max); @@ -633,9 +633,9 @@ public class OS extends C { /** @param str cast=(const gchar *) * @category custom */ - public static final native long /*int*/ _g_utf8_offset_to_utf16_offset(long /*int*/ str, long /*int*/ offset); + public static final native long _g_utf8_offset_to_utf16_offset(long str, long offset); /** custom version of g_utf8 for 16 bit */ - public static final long /*int*/ g_utf8_offset_to_utf16_offset(long /*int*/ str, long /*int*/ offset) { + public static final long g_utf8_offset_to_utf16_offset(long str, long offset) { lock.lock(); try { return _g_utf8_offset_to_utf16_offset(str, offset); @@ -646,9 +646,9 @@ public class OS extends C { /** @param str cast=(const gchar *) * @category custom */ - public static final native long /*int*/ _g_utf16_offset_to_utf8_offset(long /*int*/ str, long /*int*/ offset); + public static final native long _g_utf16_offset_to_utf8_offset(long str, long offset); /** custom version of g_utf8 for 16 bit */ - public static final long /*int*/ g_utf16_offset_to_utf8_offset(long /*int*/ str, long /*int*/ offset) { + public static final long g_utf16_offset_to_utf8_offset(long str, long offset) { lock.lock(); try { return _g_utf16_offset_to_utf8_offset(str, offset); @@ -816,26 +816,26 @@ public static final native int XAnyEvent_sizeof(); public static final native int XEvent_sizeof(); public static final native int XExposeEvent_sizeof(); public static final native int XFocusChangeEvent_sizeof(); -public static final native long /*int*/ localeconv_decimal_point(); +public static final native long localeconv_decimal_point(); /** * @param path cast=(const char *) * @param realPath cast=(char *) */ -public static final native long /*int*/ realpath(byte[] path, byte[] realPath); +public static final native long realpath(byte[] path, byte[] realPath); /** Object private fields accessors */ /** @param object_class cast=(GObjectClass *) */ -public static final native long /*int*/ G_OBJECT_CLASS_CONSTRUCTOR(long /*int*/ object_class); +public static final native long G_OBJECT_CLASS_CONSTRUCTOR(long object_class); /** * @param object_class cast=(GObjectClass *) * @paramOFF constructor cast=(GObject* (*) (GType, guint, GObjectConstructParam *)) */ -public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(long /*int*/ object_class, long /*int*/ constructor); +public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(long object_class, long constructor); /** @param xevent cast=(XEvent *) */ -public static final native int X_EVENT_TYPE(long /*int*/ xevent); +public static final native int X_EVENT_TYPE(long xevent); /** @param xevent cast=(XAnyEvent *) */ -public static final native long /*int*/ X_EVENT_WINDOW(long /*int*/ xevent); +public static final native long X_EVENT_WINDOW(long xevent); /** X11 Native methods and constants */ public static final int Above = 0; @@ -852,7 +852,7 @@ public static final int FocusOut = 10; public static final int GraphicsExpose = 13; public static final int NoExpose = 14; public static final int ExposureMask = 1 << 15; -public static final long /*int*/ NoEventMask = 0; +public static final long NoEventMask = 0; public static final int NotifyNormal = 0; public static final int NotifyGrab = 1; public static final int NotifyHint = 1; @@ -864,8 +864,8 @@ public static final int NotifyNonlinear = 3; public static final int NotifyNonlinearVirtual = 4; public static final int NotifyPointer = 5; public static final int RevertToParent = 2; -public static final native int _Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2); -public static final int Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2) { +public static final native int _Call(long proc, long arg1, long arg2); +public static final int Call(long proc, long arg1, long arg2) { lock.lock(); try { return _Call(proc, arg1, arg2); @@ -873,8 +873,8 @@ public static final int Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ lock.unlock(); } } -public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6); -public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6) { +public static final native long _call (long function, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6); +public static final long call (long function, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) { lock.lock(); try { return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6); @@ -882,8 +882,8 @@ public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, lock.unlock(); } } -public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3); -public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) { +public static final native long _call (long function, long arg0, long arg1, long arg2, long arg3); +public static final long call (long function, long arg0, long arg1, long arg2, long arg3) { lock.lock(); try { return _call(function, arg0, arg1, arg2, arg3); @@ -891,8 +891,8 @@ public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, lock.unlock(); } } -public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5); -public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5) { +public static final native long _call (long function, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5); +public static final long call (long function, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) { lock.lock(); try { return _call(function, arg0, arg1, arg2, arg3, arg4, arg5); @@ -906,8 +906,8 @@ public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, * @param predicate cast=(Bool (*)()) * @param arg cast=(XPointer) */ -public static final native boolean _XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg); -public static final boolean XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg) { +public static final native boolean _XCheckIfEvent(long display, long event_return, long predicate, long arg); +public static final boolean XCheckIfEvent(long display, long event_return, long predicate, long arg) { lock.lock(); try { return _XCheckIfEvent(display, event_return, predicate, arg); @@ -916,8 +916,8 @@ public static final boolean XCheckIfEvent(long /*int*/ display, long /*int*/ eve } } /** @param display cast=(Display *) */ -public static final native int _XDefaultScreen(long /*int*/ display); -public static final int XDefaultScreen(long /*int*/ display) { +public static final native int _XDefaultScreen(long display); +public static final int XDefaultScreen(long display) { lock.lock(); try { return _XDefaultScreen(display); @@ -926,8 +926,8 @@ public static final int XDefaultScreen(long /*int*/ display) { } } /** @param display cast=(Display *) */ -public static final native long /*int*/ _XDefaultRootWindow(long /*int*/ display); -public static final long /*int*/ XDefaultRootWindow(long /*int*/ display) { +public static final native long _XDefaultRootWindow(long display); +public static final long XDefaultRootWindow(long display) { lock.lock(); try { return _XDefaultRootWindow(display); @@ -936,8 +936,8 @@ public static final long /*int*/ XDefaultRootWindow(long /*int*/ display) { } } /** @param address cast=(void *) */ -public static final native void _XFree(long /*int*/ address); -public static final void XFree(long /*int*/ address) { +public static final native void _XFree(long address); +public static final void XFree(long address) { lock.lock(); try { _XFree(address); @@ -957,8 +957,8 @@ public static final void XFree(long /*int*/ address) { * @param win_y_return cast=(int *) * @param mask_return cast=(unsigned int *) */ -public static final native int _XQueryPointer(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return); -public static final int XQueryPointer(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) { +public static final native int _XQueryPointer(long display, long w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return); +public static final int XQueryPointer(long display, long w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) { lock.lock(); try { return _XQueryPointer(display, w, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return); @@ -967,8 +967,8 @@ public static final int XQueryPointer(long /*int*/ display, long /*int*/ w, long } } /** @param handler cast=(XIOErrorHandler) */ -public static final native long /*int*/ _XSetIOErrorHandler(long /*int*/ handler); -public static final long /*int*/ XSetIOErrorHandler(long /*int*/ handler) { +public static final native long _XSetIOErrorHandler(long handler); +public static final long XSetIOErrorHandler(long handler) { lock.lock(); try { return _XSetIOErrorHandler(handler); @@ -977,8 +977,8 @@ public static final long /*int*/ XSetIOErrorHandler(long /*int*/ handler) { } } /** @param handler cast=(XErrorHandler) */ -public static final native long /*int*/ _XSetErrorHandler(long /*int*/ handler); -public static final long /*int*/ XSetErrorHandler(long /*int*/ handler) { +public static final native long _XSetErrorHandler(long handler); +public static final long XSetErrorHandler(long handler) { lock.lock(); try { return _XSetErrorHandler(handler); @@ -990,8 +990,8 @@ public static final long /*int*/ XSetErrorHandler(long /*int*/ handler) { * @param display cast=(Display *) * @param window cast=(Window) */ -public static final native int _XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time); -public static final int XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time) { +public static final native int _XSetInputFocus(long display, long window, int revert, int time); +public static final int XSetInputFocus(long display, long window, int revert, int time) { lock.lock(); try { return _XSetInputFocus(display, window, revert, time); @@ -1004,8 +1004,8 @@ public static final int XSetInputFocus(long /*int*/ display, long /*int*/ window * @param w cast=(Window) * @param prop_window cast=(Window) */ -public static final native int _XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window); -public static final int XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window) { +public static final native int _XSetTransientForHint(long display, long w, long prop_window); +public static final int XSetTransientForHint(long display, long w, long prop_window) { lock.lock(); try { return _XSetTransientForHint(display, w, prop_window); @@ -1014,8 +1014,8 @@ public static final int XSetTransientForHint(long /*int*/ display, long /*int*/ } } /** @param display cast=(Display *) */ -public static final native long /*int*/ _XSynchronize(long /*int*/ display, boolean onoff); -public static final long /*int*/ XSynchronize(long /*int*/ display, boolean onoff) { +public static final native long _XSynchronize(long display, boolean onoff); +public static final long XSynchronize(long display, boolean onoff) { lock.lock(); try { return _XSynchronize(display, onoff); @@ -1028,19 +1028,19 @@ public static final long /*int*/ XSynchronize(long /*int*/ display, boolean onof * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, XExposeEvent src, long /*int*/ size); +public static final native void memmove(long dest, XExposeEvent src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(XExposeEvent dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(XExposeEvent dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(XFocusChangeEvent dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(XFocusChangeEvent dest, long src, long size); /** @method flags=const */ public static final native int RTLD_GLOBAL(); @@ -1051,10 +1051,10 @@ public static final native int RTLD_LAZY(); /** Natives */ -public static final native int Call (long /*int*/ func, long /*int*/ arg0, int arg1, int arg2); -public static final native long Call (long /*int*/ func, long /*int*/ arg0, int arg1, long arg2); -public static final native long /*int*/ _G_OBJECT_CLASS (long /*int*/ klass); -public static final long /*int*/ G_OBJECT_CLASS (long /*int*/ klass) { +public static final native int Call (long func, long arg0, int arg1, int arg2); +public static final native long Call (long func, long arg0, int arg1, long arg2); +public static final native long _G_OBJECT_CLASS (long klass); +public static final long G_OBJECT_CLASS (long klass) { lock.lock(); try { return _G_OBJECT_CLASS(klass); @@ -1062,8 +1062,8 @@ public static final long /*int*/ G_OBJECT_CLASS (long /*int*/ klass) { lock.unlock(); } } -public static final native long /*int*/ _G_OBJECT_GET_CLASS (long /*int*/ object); -public static final long /*int*/ G_OBJECT_GET_CLASS (long /*int*/ object) { +public static final native long _G_OBJECT_GET_CLASS (long object); +public static final long G_OBJECT_GET_CLASS (long object) { lock.lock(); try { return _G_OBJECT_GET_CLASS(object); @@ -1071,8 +1071,8 @@ public static final long /*int*/ G_OBJECT_GET_CLASS (long /*int*/ object) { lock.unlock(); } } -public static final native long /*int*/ _G_OBJECT_TYPE_NAME (long /*int*/ object); -public static final long /*int*/ G_OBJECT_TYPE_NAME (long /*int*/ object) { +public static final native long _G_OBJECT_TYPE_NAME (long object); +public static final long G_OBJECT_TYPE_NAME (long object) { lock.lock(); try { return _G_OBJECT_TYPE_NAME(object); @@ -1081,7 +1081,7 @@ public static final long /*int*/ G_OBJECT_TYPE_NAME (long /*int*/ object) { } } -public static final native boolean _G_TYPE_CHECK_INSTANCE_TYPE (long /*int*/ instance, long /*int*/ type); +public static final native boolean _G_TYPE_CHECK_INSTANCE_TYPE (long instance, long type); /** * Note: G_TYPE_CHECK_INSTANCE_TYPE is not a good way to check for instance type, * The C-Macro doesn't seem to work reliably in the context of being invoked from Java @@ -1089,7 +1089,7 @@ public static final native boolean _G_TYPE_CHECK_INSTANCE_TYPE (long /*int*/ ins * But webkit1 development has halted and it's not worth the effort to change this. * I.e, kept for legacy reason but don't use this. Instead, to identify type, use user_data. (see Webkit proc3 as example). */ -public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (long /*int*/ instance, long /*int*/ type) { +public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (long instance, long type) { lock.lock(); try { return _G_TYPE_CHECK_INSTANCE_TYPE(instance, type); @@ -1098,18 +1098,18 @@ public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (long /*int*/ instance, l } } /** @method flags=const */ -public static final native long /*int*/ G_TYPE_BOOLEAN(); +public static final native long G_TYPE_BOOLEAN(); /** @method flags=const */ -public static final native long /*int*/ G_TYPE_DOUBLE(); +public static final native long G_TYPE_DOUBLE(); /** @method flags=const */ -public static final native long /*int*/ G_TYPE_FLOAT(); +public static final native long G_TYPE_FLOAT(); /** @method flags=const */ -public static final native long /*int*/ G_TYPE_INT(); +public static final native long G_TYPE_INT(); /** @method flags=const */ -public static final native long /*int*/ G_TYPE_INT64(); -public static final native long /*int*/ G_VALUE_TYPE(long /*int*/ value); -public static final native long /*int*/ _G_OBJECT_TYPE (long /*int*/ instance); -public static final long /*int*/ G_OBJECT_TYPE (long /*int*/ instance) { +public static final native long G_TYPE_INT64(); +public static final native long G_VALUE_TYPE(long value); +public static final native long _G_OBJECT_TYPE (long instance); +public static final long G_OBJECT_TYPE (long instance) { lock.lock(); try { return _G_OBJECT_TYPE(instance); @@ -1118,8 +1118,8 @@ public static final long /*int*/ G_OBJECT_TYPE (long /*int*/ instance) { } } /** @method flags=const */ -public static final native long /*int*/ _G_TYPE_STRING(); -public static final long /*int*/ G_TYPE_STRING() { +public static final native long _G_TYPE_STRING(); +public static final long G_TYPE_STRING() { lock.lock(); try { return _G_TYPE_STRING(); @@ -1137,8 +1137,8 @@ public static final int PANGO_PIXELS(int dimension) { } } /** @method flags=const */ -public static final native long /*int*/ _PANGO_TYPE_FONT_DESCRIPTION(); -public static final long /*int*/ PANGO_TYPE_FONT_DESCRIPTION() { +public static final native long _PANGO_TYPE_FONT_DESCRIPTION(); +public static final long PANGO_TYPE_FONT_DESCRIPTION() { lock.lock(); try { return _PANGO_TYPE_FONT_DESCRIPTION(); @@ -1147,8 +1147,8 @@ public static final long /*int*/ PANGO_TYPE_FONT_DESCRIPTION() { } } /** @method flags=const */ -public static final native long /*int*/ _PANGO_TYPE_FONT_FAMILY(); -public static final long /*int*/ PANGO_TYPE_FONT_FAMILY() { +public static final native long _PANGO_TYPE_FONT_FAMILY(); +public static final long PANGO_TYPE_FONT_FAMILY() { lock.lock(); try { return _PANGO_TYPE_FONT_FAMILY(); @@ -1157,8 +1157,8 @@ public static final long /*int*/ PANGO_TYPE_FONT_FAMILY() { } } /** @method flags=const */ -public static final native long /*int*/ _PANGO_TYPE_FONT_FACE(); -public static final long /*int*/ PANGO_TYPE_FONT_FACE() { +public static final native long _PANGO_TYPE_FONT_FACE(); +public static final long PANGO_TYPE_FONT_FACE() { lock.lock(); try { return _PANGO_TYPE_FONT_FACE(); @@ -1167,8 +1167,8 @@ public static final long /*int*/ PANGO_TYPE_FONT_FACE() { } } /** @method flags=const */ -public static final native long /*int*/ _PANGO_TYPE_LAYOUT(); -public static final long /*int*/ PANGO_TYPE_LAYOUT() { +public static final native long _PANGO_TYPE_LAYOUT(); +public static final long PANGO_TYPE_LAYOUT() { lock.lock(); try { return _PANGO_TYPE_LAYOUT(); @@ -1177,8 +1177,8 @@ public static final long /*int*/ PANGO_TYPE_LAYOUT() { } } /** @param filename cast=(const char *) */ -public static final native long /*int*/ _dlopen(byte[] filename, int flag); -public static final long /*int*/ dlopen(byte[] filename, int flag) { +public static final native long _dlopen(byte[] filename, int flag); +public static final long dlopen(byte[] filename, int flag) { lock.lock(); try { return _dlopen(filename, flag); @@ -1192,8 +1192,8 @@ public static final long /*int*/ dlopen(byte[] filename, int flag) { * @param flags cast=(GAppInfoCreateFlags) * @param error cast=(GError **) */ -public static final native long /*int*/ _g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error); -public static final long /*int*/ g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error) { +public static final native long _g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long flags, long error); +public static final long g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long flags, long error) { lock.lock(); try { return _g_app_info_create_from_commandline(commandline, applName, flags, error); @@ -1201,8 +1201,8 @@ public static final long /*int*/ g_app_info_create_from_commandline(byte[] comma lock.unlock(); } } -public static final native long /*int*/ _g_app_info_get_all(); -public static final long /*int*/ g_app_info_get_all() { +public static final native long _g_app_info_get_all(); +public static final long g_app_info_get_all() { lock.lock(); try { return _g_app_info_get_all(); @@ -1213,8 +1213,8 @@ public static final long /*int*/ g_app_info_get_all() { /** * @param appInfo cast=(GAppInfo *) */ -public static final native long /*int*/ _g_app_info_get_executable(long /*int*/ appInfo); -public static final long /*int*/ g_app_info_get_executable(long /*int*/ appInfo) { +public static final native long _g_app_info_get_executable(long appInfo); +public static final long g_app_info_get_executable(long appInfo) { lock.lock(); try { return _g_app_info_get_executable(appInfo); @@ -1225,8 +1225,8 @@ public static final long /*int*/ g_app_info_get_executable(long /*int*/ appInfo) /** * @param appInfo cast=(GAppInfo *) */ -public static final native long /*int*/ _g_app_info_get_icon(long /*int*/ appInfo); -public static final long /*int*/ g_app_info_get_icon(long /*int*/ appInfo) { +public static final native long _g_app_info_get_icon(long appInfo); +public static final long g_app_info_get_icon(long appInfo) { lock.lock(); try { return _g_app_info_get_icon(appInfo); @@ -1237,8 +1237,8 @@ public static final long /*int*/ g_app_info_get_icon(long /*int*/ appInfo) { /** * @param appInfo cast=(GAppInfo *) */ -public static final native long /*int*/ _g_app_info_get_name(long /*int*/ appInfo); -public static final long /*int*/ g_app_info_get_name(long /*int*/ appInfo) { +public static final native long _g_app_info_get_name(long appInfo); +public static final long g_app_info_get_name(long appInfo) { lock.lock(); try { return _g_app_info_get_name(appInfo); @@ -1252,8 +1252,8 @@ public static final long /*int*/ g_app_info_get_name(long /*int*/ appInfo) { * @param launchContext cast=(GAppLaunchContext *) * @param error cast=(GError **) */ -public static final native boolean _g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error); -public static final boolean g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error) { +public static final native boolean _g_app_info_launch(long appInfo, long list, long launchContext, long error); +public static final boolean g_app_info_launch(long appInfo, long list, long launchContext, long error) { lock.lock(); try { return _g_app_info_launch(appInfo, list, launchContext, error); @@ -1265,8 +1265,8 @@ public static final boolean g_app_info_launch(long /*int*/ appInfo, long /*int*/ * @param mimeType cast=(gchar *) * @param mustSupportURIs cast=(gboolean) */ -public static final native long /*int*/ _g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs); -public static final long /*int*/ g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs) { +public static final native long _g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs); +public static final long g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs) { lock.lock(); try { return _g_app_info_get_default_for_type(mimeType, mustSupportURIs); @@ -1279,8 +1279,8 @@ public static final long /*int*/ g_app_info_get_default_for_type(byte[] mimeType * @param launchContext cast=(GAppLaunchContext *) * @param error cast=(GError **) */ -public static final native boolean _g_app_info_launch_default_for_uri(long /*int*/ uri, long /*int*/ launchContext, long /*int*/ error); -public static final boolean g_app_info_launch_default_for_uri(long /*int*/ uri, long /*int*/ launchContext, long /*int*/ error) { +public static final native boolean _g_app_info_launch_default_for_uri(long uri, long launchContext, long error); +public static final boolean g_app_info_launch_default_for_uri(long uri, long launchContext, long error) { lock.lock(); try { return _g_app_info_launch_default_for_uri(uri, launchContext, error); @@ -1291,8 +1291,8 @@ public static final boolean g_app_info_launch_default_for_uri(long /*int*/ uri, /** * @param appInfo cast=(GAppInfo *) */ -public static final native boolean _g_app_info_should_show(long /*int*/ appInfo); -public static final boolean g_app_info_should_show(long /*int*/ appInfo) { +public static final native boolean _g_app_info_should_show(long appInfo); +public static final boolean g_app_info_should_show(long appInfo) { lock.lock(); try { return _g_app_info_should_show(appInfo); @@ -1303,8 +1303,8 @@ public static final boolean g_app_info_should_show(long /*int*/ appInfo) { /** * @param appInfo cast=(GAppInfo *) */ -public static final native boolean _g_app_info_supports_uris(long /*int*/ appInfo); -public static final boolean g_app_info_supports_uris(long /*int*/ appInfo) { +public static final native boolean _g_app_info_supports_uris(long appInfo); +public static final boolean g_app_info_supports_uris(long appInfo) { lock.lock(); try { return _g_app_info_supports_uris(appInfo); @@ -1315,8 +1315,8 @@ public static final boolean g_app_info_supports_uris(long /*int*/ appInfo) { /** * @param error cast=(GError *) */ -public static final native long /*int*/ _g_error_get_message (long /*int*/ error); -public static final long /*int*/ g_error_get_message (long /*int*/ error) { +public static final native long _g_error_get_message (long error); +public static final long g_error_get_message (long error) { lock.lock(); try { return _g_error_get_message (error); @@ -1328,8 +1328,8 @@ public static final long /*int*/ g_error_get_message (long /*int*/ error) { /** * @param gerror cast=(GError *) */ -public static final native void _g_error_free(long /*int*/ gerror); -public static final void g_error_free(long /*int*/ gerror) { +public static final native void _g_error_free(long gerror); +public static final void g_error_free(long gerror) { lock.lock(); try { _g_error_free(gerror); @@ -1342,8 +1342,8 @@ public static final void g_error_free(long /*int*/ gerror) { * @param type1 cast=(gchar *) * @param type2 cast=(gchar *) */ -public static final native boolean _g_content_type_equals(long /*int*/ type1, byte[] type2); -public static final boolean g_content_type_equals(long /*int*/ type1, byte[] type2) { +public static final native boolean _g_content_type_equals(long type1, byte[] type2); +public static final boolean g_content_type_equals(long type1, byte[] type2) { lock.lock(); try { return _g_content_type_equals(type1, type2); @@ -1355,8 +1355,8 @@ public static final boolean g_content_type_equals(long /*int*/ type1, byte[] typ * @param type cast=(gchar *) * @param supertype cast=(gchar *) */ -public static final native boolean _g_content_type_is_a(long /*int*/ type, byte[] supertype); -public static final boolean g_content_type_is_a(long /*int*/ type, byte[] supertype) { +public static final native boolean _g_content_type_is_a(long type, byte[] supertype); +public static final boolean g_content_type_is_a(long type, byte[] supertype) { lock.lock(); try { return _g_content_type_is_a(type, supertype); @@ -1367,8 +1367,8 @@ public static final boolean g_content_type_is_a(long /*int*/ type, byte[] supert /** * @param info cast=(GFileInfo *) */ -public static final native long /*int*/ _g_file_info_get_content_type (long /*int*/ info); -public static final long /*int*/ g_file_info_get_content_type (long /*int*/ info) { +public static final native long _g_file_info_get_content_type (long info); +public static final long g_file_info_get_content_type (long info) { lock.lock(); try { return _g_file_info_get_content_type (info); @@ -1379,8 +1379,8 @@ public static final long /*int*/ g_file_info_get_content_type (long /*int*/ info /** * @param file cast=(GFile *) */ -public static final native long /*int*/ _g_file_get_uri(long /*int*/ file); -public static final long /*int*/ g_file_get_uri (long /*int*/ file) { +public static final native long _g_file_get_uri(long file); +public static final long g_file_get_uri (long file) { lock.lock(); try { return _g_file_get_uri(file); @@ -1389,8 +1389,8 @@ public static final long /*int*/ g_file_get_uri (long /*int*/ file) { } } /** @param fileName cast=(const char *) */ -public static final native long /*int*/ _g_file_new_for_path(byte[] fileName); -public static final long /*int*/ g_file_new_for_path(byte[] fileName) { +public static final native long _g_file_new_for_path(byte[] fileName); +public static final long g_file_new_for_path(byte[] fileName) { lock.lock(); try { return _g_file_new_for_path(fileName); @@ -1401,8 +1401,8 @@ public static final long /*int*/ g_file_new_for_path(byte[] fileName) { /** * @param fileName cast=(const char *) */ -public static final native long /*int*/ _g_file_new_for_commandline_arg(byte[] fileName); -public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) { +public static final native long _g_file_new_for_commandline_arg(byte[] fileName); +public static final long g_file_new_for_commandline_arg(byte[] fileName) { lock.lock(); try { return _g_file_new_for_commandline_arg(fileName); @@ -1411,8 +1411,8 @@ public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) } } /** @param fileName cast=(const char *) */ -public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName); -public static final long /*int*/ g_file_new_for_uri(byte[] fileName) { +public static final native long _g_file_new_for_uri(byte[] fileName); +public static final long g_file_new_for_uri(byte[] fileName) { lock.lock(); try { return _g_file_new_for_uri(fileName); @@ -1427,8 +1427,8 @@ public static final long /*int*/ g_file_new_for_uri(byte[] fileName) { * @param cancellable cast=(GCancellable *) * @param error cast=(GError **) */ -public static final native long /*int*/ _g_file_query_info (long /*int*/ file, byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error); -public static final long /*int*/ g_file_query_info (long /*int*/ file,byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error) { +public static final native long _g_file_query_info (long file, byte[] attributes, long flags, long cancellable, long error); +public static final long g_file_query_info (long file,byte[] attributes, long flags, long cancellable, long error) { lock.lock(); try { return _g_file_query_info (file, attributes, flags, cancellable, error); @@ -1450,8 +1450,8 @@ public static final boolean /*long*/ g_file_test(byte[] file, int test) { } } /** @param icon cast=(GIcon *) */ -public static final native long /*int*/ _g_icon_to_string(long /*int*/ icon); -public static final long /*int*/ g_icon_to_string (long /*int*/ icon) { +public static final native long _g_icon_to_string(long icon); +public static final long g_icon_to_string (long icon) { lock.lock(); try { return _g_icon_to_string(icon); @@ -1463,8 +1463,8 @@ public static final long /*int*/ g_icon_to_string (long /*int*/ icon) { * @param str cast=(const gchar *) * @param error cast=(GError **) */ -public static final native long /*int*/ _g_icon_new_for_string(byte[] str, long /*int*/ error[]); -public static final long /*int*/ g_icon_new_for_string (byte[] str, long /*int*/ error[]) { +public static final native long _g_icon_new_for_string(byte[] str, long error[]); +public static final long g_icon_new_for_string (byte[] str, long error[]) { lock.lock(); try { return _g_icon_new_for_string(str, error); @@ -1479,8 +1479,8 @@ public static final long /*int*/ g_icon_new_for_string (byte[] str, long /*int*/ * @param hook_data cast=(gpointer) * @param data_destroy cast=(GDestroyNotify) */ -public static final native long /*int*/ _g_signal_add_emission_hook(int signal_id, int detail, long /*int*/ hook_func, long /*int*/ hook_data, long /*int*/ data_destroy); -public static final long /*int*/ g_signal_add_emission_hook(int signal_id, int detail, long /*int*/ hook_func, long /*int*/ hook_data, long /*int*/ data_destroy) { +public static final native long _g_signal_add_emission_hook(int signal_id, int detail, long hook_func, long hook_data, long data_destroy); +public static final long g_signal_add_emission_hook(int signal_id, int detail, long hook_func, long hook_data, long data_destroy) { lock.lock(); try { return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy); @@ -1492,8 +1492,8 @@ public static final long /*int*/ g_signal_add_emission_hook(int signal_id, int d * @param signal_id cast=(guint) * @param hook_id cast=(gulong) */ -public static final native void _g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id); -public static final void g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id) { +public static final native void _g_signal_remove_emission_hook(int signal_id, long hook_id); +public static final void g_signal_remove_emission_hook(int signal_id, long hook_id) { lock.lock(); try { _g_signal_remove_emission_hook (signal_id, hook_id); @@ -1506,8 +1506,8 @@ public static final void g_signal_remove_emission_hook(int signal_id, long /*int * @param user_data cast=(gpointer) * @param destroy_data cast=(GClosureNotify) */ -public static final native long /*int*/ _g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data); -public static final long /*int*/ g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data) { +public static final native long _g_cclosure_new(long callback_func, long user_data, long destroy_data); +public static final long g_cclosure_new(long callback_func, long user_data, long destroy_data) { lock.lock(); try { return _g_cclosure_new(callback_func, user_data, destroy_data); @@ -1516,8 +1516,8 @@ public static final long /*int*/ g_cclosure_new(long /*int*/ callback_func, long } } /** @param closure cast=(GClosure *) */ -public static final native long /*int*/ _g_closure_ref(long /*int*/ closure); -public static final long /*int*/ g_closure_ref(long /*int*/ closure) { +public static final native long _g_closure_ref(long closure); +public static final long g_closure_ref(long closure) { lock.lock(); try { return _g_closure_ref(closure); @@ -1526,8 +1526,8 @@ public static final long /*int*/ g_closure_ref(long /*int*/ closure) { } } /** @param closure cast=(GClosure *) */ -public static final native void _g_closure_sink(long /*int*/ closure); -public static final void g_closure_sink(long /*int*/ closure) { +public static final native void _g_closure_sink(long closure); +public static final void g_closure_sink(long closure) { lock.lock(); try { _g_closure_sink(closure); @@ -1536,8 +1536,8 @@ public static final void g_closure_sink(long /*int*/ closure) { } } /** @param closure cast=(GClosure *) */ -public static final native void _g_closure_unref(long /*int*/ closure); -public static final void g_closure_unref(long /*int*/ closure) { +public static final native void _g_closure_unref(long closure); +public static final void g_closure_unref(long closure) { lock.lock(); try { _g_closure_unref(closure); @@ -1546,8 +1546,8 @@ public static final void g_closure_unref(long /*int*/ closure) { } } /** @param context cast=(GMainContext *) */ -public static final native boolean _g_main_context_acquire(long /*int*/ context); -public static final boolean g_main_context_acquire(long /*int*/ context) { +public static final native boolean _g_main_context_acquire(long context); +public static final boolean g_main_context_acquire(long context) { lock.lock(); try { return _g_main_context_acquire(context); @@ -1559,8 +1559,8 @@ public static final boolean g_main_context_acquire(long /*int*/ context) { * @param context cast=(GMainContext *) * @param fds cast=(GPollFD *) */ -public static final native int _g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds); -public static final int g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds) { +public static final native int _g_main_context_check(long context, int max_priority, long fds, int n_fds); +public static final int g_main_context_check(long context, int max_priority, long fds, int n_fds) { lock.lock(); try { return _g_main_context_check(context, max_priority, fds, n_fds); @@ -1568,8 +1568,8 @@ public static final int g_main_context_check(long /*int*/ context, int max_prior lock.unlock(); } } -public static final native long /*int*/ _g_main_context_default(); -public static final long /*int*/ g_main_context_default() { +public static final native long _g_main_context_default(); +public static final long g_main_context_default() { lock.lock(); try { return _g_main_context_default(); @@ -1578,8 +1578,8 @@ public static final long /*int*/ g_main_context_default() { } } /** @param context cast=(GMainContext *) */ -public static final native boolean _g_main_context_iteration(long /*int*/ context, boolean may_block); -public static final boolean g_main_context_iteration(long /*int*/ context, boolean may_block) { +public static final native boolean _g_main_context_iteration(long context, boolean may_block); +public static final boolean g_main_context_iteration(long context, boolean may_block) { lock.lock(); try { return _g_main_context_iteration(context, may_block); @@ -1588,8 +1588,8 @@ public static final boolean g_main_context_iteration(long /*int*/ context, boole } } /** @param context cast=(GMainContext *) */ -public static final native long /*int*/ _g_main_context_get_poll_func(long /*int*/ context); -public static final long /*int*/ g_main_context_get_poll_func(long /*int*/ context) { +public static final native long _g_main_context_get_poll_func(long context); +public static final long g_main_context_get_poll_func(long context) { lock.lock(); try { return _g_main_context_get_poll_func(context); @@ -1601,8 +1601,8 @@ public static final long /*int*/ g_main_context_get_poll_func(long /*int*/ conte * @param context cast=(GMainContext *) * @param priority cast=(gint *) */ -public static final native boolean _g_main_context_prepare(long /*int*/ context, int[] priority); -public static final boolean g_main_context_prepare(long /*int*/ context, int[] priority) { +public static final native boolean _g_main_context_prepare(long context, int[] priority); +public static final boolean g_main_context_prepare(long context, int[] priority) { lock.lock(); try { return _g_main_context_prepare(context, priority); @@ -1615,8 +1615,8 @@ public static final boolean g_main_context_prepare(long /*int*/ context, int[] p * @param fds cast=(GPollFD *) * @param timeout_ cast=(gint *) */ -public static final native int _g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds); -public static final int g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds) { +public static final native int _g_main_context_query(long context, int max_priority, int[] timeout_, long fds, int n_fds); +public static final int g_main_context_query(long context, int max_priority, int[] timeout_, long fds, int n_fds) { lock.lock(); try { return _g_main_context_query(context, max_priority, timeout_, fds, n_fds); @@ -1625,8 +1625,8 @@ public static final int g_main_context_query(long /*int*/ context, int max_prior } } /** @param context cast=(GMainContext *) */ -public static final native void _g_main_context_release(long /*int*/ context); -public static final void g_main_context_release(long /*int*/ context) { +public static final native void _g_main_context_release(long context); +public static final void g_main_context_release(long context) { lock.lock(); try { _g_main_context_release(context); @@ -1635,7 +1635,7 @@ public static final void g_main_context_release(long /*int*/ context) { } } /** @param context cast=(GMainContext *) */ -public static final native void g_main_context_wakeup(long /*int*/ context); +public static final native void g_main_context_wakeup(long context); /** * @param opsysstring cast=(const gchar *) * @param len cast=(gssize) @@ -1643,8 +1643,8 @@ public static final native void g_main_context_wakeup(long /*int*/ context); * @param bytes_written cast=(gsize *) * @param error cast=(GError **) */ -public static final native long /*int*/ _g_filename_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error); -public static final long /*int*/ g_filename_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) { +public static final native long _g_filename_to_utf8(long opsysstring, long len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error); +public static final long g_filename_to_utf8(long opsysstring, long len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) { lock.lock(); try { return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error); @@ -1653,8 +1653,8 @@ public static final long /*int*/ g_filename_to_utf8(long /*int*/ opsysstring, lo } } /** @param filename cast=(const gchar *) */ -public static final native long /*int*/ _g_filename_display_name(long /*int*/ filename); -public static final long /*int*/ g_filename_display_name(long /*int*/ filename) { +public static final native long _g_filename_display_name(long filename); +public static final long g_filename_display_name(long filename) { lock.lock(); try { return _g_filename_display_name(filename); @@ -1667,8 +1667,8 @@ public static final long /*int*/ g_filename_display_name(long /*int*/ filename) * @param hostname cast=(const char *) * @param error cast=(GError **) */ -public static final native long /*int*/ _g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error); -public static final long /*int*/ g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error) { +public static final native long _g_filename_to_uri(long filename, long hostname, long /*int*/[] error); +public static final long g_filename_to_uri(long filename, long hostname, long /*int*/[] error) { lock.lock(); try { return _g_filename_to_uri(filename, hostname, error); @@ -1683,8 +1683,8 @@ public static final long /*int*/ g_filename_to_uri(long /*int*/ filename, long / * @param bytes_written cast=(gsize *) * @param error cast=(GError **) */ -public static final native long /*int*/ _g_filename_from_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error); -public static final long /*int*/ g_filename_from_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) { +public static final native long _g_filename_from_utf8(long opsysstring, long len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error); +public static final long g_filename_from_utf8(long opsysstring, long len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) { lock.lock(); try { return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error); @@ -1697,8 +1697,8 @@ public static final long /*int*/ g_filename_from_utf8(long /*int*/ opsysstring, * @param hostname cast=(char **) * @param error cast=(GError **) */ -public static final native long /*int*/ _g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error); -public static final long /*int*/ g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error) { +public static final native long _g_filename_from_uri(long uri, long /*int*/[] hostname, long /*int*/[] error); +public static final long g_filename_from_uri(long uri, long /*int*/[] hostname, long /*int*/[] error) { lock.lock(); try { return _g_filename_from_uri(uri, hostname, error); @@ -1707,8 +1707,8 @@ public static final long /*int*/ g_filename_from_uri(long /*int*/ uri, long /*in } } /** @param mem cast=(gpointer) */ -public static final native void _g_free(long /*int*/ mem); -public static final void g_free(long /*int*/ mem) { +public static final native void _g_free(long mem); +public static final void g_free(long mem) { lock.lock(); try { _g_free(mem); @@ -1719,8 +1719,8 @@ public static final void g_free(long /*int*/ mem) { /** * @param table cast=(GHashTable *) */ -public static final native long /*int*/ _g_hash_table_get_values(long /*int*/ table); -public static final long /*int*/ g_hash_table_get_values(long /*int*/ table) { +public static final native long _g_hash_table_get_values(long table); +public static final long g_hash_table_get_values(long table) { lock.lock(); try { return _g_hash_table_get_values(table); @@ -1732,8 +1732,8 @@ public static final long /*int*/ g_hash_table_get_values(long /*int*/ table) { * @param function cast=(GSourceFunc) * @param data cast=(gpointer) */ -public static final native int _g_idle_add(long /*int*/ function, long /*int*/ data); -public static final int g_idle_add(long /*int*/ function, long /*int*/ data) { +public static final native int _g_idle_add(long function, long data); +public static final int g_idle_add(long function, long data) { lock.lock(); try { return _g_idle_add(function, data); @@ -1745,8 +1745,8 @@ public static final int g_idle_add(long /*int*/ function, long /*int*/ data) { * @param list cast=(GList *) * @param data cast=(gpointer) */ -public static final native long /*int*/ _g_list_append(long /*int*/ list, long /*int*/ data); -public static final long /*int*/ g_list_append(long /*int*/ list, long /*int*/ data) { +public static final native long _g_list_append(long list, long data); +public static final long g_list_append(long list, long data) { lock.lock(); try { return _g_list_append(list, data); @@ -1755,8 +1755,8 @@ public static final long /*int*/ g_list_append(long /*int*/ list, long /*int*/ d } } /** @param list cast=(GList *) */ -public static final native long /*int*/ _g_list_data(long /*int*/ list); -public static final long /*int*/ g_list_data(long /*int*/ list) { +public static final native long _g_list_data(long list); +public static final long g_list_data(long list) { lock.lock(); try { return _g_list_data(list); @@ -1765,8 +1765,8 @@ public static final long /*int*/ g_list_data(long /*int*/ list) { } } /** @param list cast=(GList *) */ -public static final native void _g_list_free(long /*int*/ list); -public static final void g_list_free(long /*int*/ list) { +public static final native void _g_list_free(long list); +public static final void g_list_free(long list) { lock.lock(); try { _g_list_free(list); @@ -1775,8 +1775,8 @@ public static final void g_list_free(long /*int*/ list) { } } /** @param list cast=(GList *) */ -public static final native void _g_list_free_1(long /*int*/ list); -public static final void g_list_free_1(long /*int*/ list) { +public static final native void _g_list_free_1(long list); +public static final void g_list_free_1(long list) { lock.lock(); try { _g_list_free_1(list); @@ -1787,8 +1787,8 @@ public static final void g_list_free_1(long /*int*/ list) { /** * @param list cast=(GList *) */ -public static final native long /*int*/ _g_list_last(long /*int*/ list); -public static final long /*int*/ g_list_last(long /*int*/ list) { +public static final native long _g_list_last(long list); +public static final long g_list_last(long list) { lock.lock(); try { return _g_list_last(list); @@ -1797,8 +1797,8 @@ public static final long /*int*/ g_list_last(long /*int*/ list) { } } /** @param list cast=(GList *) */ -public static final native int _g_list_length(long /*int*/ list); -public static final int g_list_length(long /*int*/ list) { +public static final native int _g_list_length(long list); +public static final int g_list_length(long list) { lock.lock(); try { return _g_list_length(list); @@ -1810,8 +1810,8 @@ public static final int g_list_length(long /*int*/ list) { * @param list cast=(GList *) * @param llist cast=(GList *) */ -public static final native void _g_list_set_next(long /*int*/ list, long /*int*/ llist); -public static final void g_list_set_next(long /*int*/ list, long /*int*/ llist) { +public static final native void _g_list_set_next(long list, long llist); +public static final void g_list_set_next(long list, long llist) { lock.lock(); try { _g_list_set_next(list, llist); @@ -1819,8 +1819,8 @@ public static final void g_list_set_next(long /*int*/ list, long /*int*/ llist) lock.unlock(); } } -public static final native long /*int*/ _g_list_next(long /*int*/ list); -public static final long /*int*/ g_list_next(long /*int*/ list) { +public static final native long _g_list_next(long list); +public static final long g_list_next(long list) { lock.lock(); try { return _g_list_next(list); @@ -1832,8 +1832,8 @@ public static final long /*int*/ g_list_next(long /*int*/ list) { * @param list cast=(GList *) * @param n cast=(guint) */ -public static final native long /*int*/ _g_list_nth(long /*int*/ list, int n); -public static final long /*int*/ g_list_nth(long /*int*/ list, int n) { +public static final native long _g_list_nth(long list, int n); +public static final long g_list_nth(long list, int n) { lock.lock(); try { return _g_list_nth(list, n); @@ -1845,8 +1845,8 @@ public static final long /*int*/ g_list_nth(long /*int*/ list, int n) { * @param list cast=(GList *) * @param n cast=(guint) */ -public static final native long /*int*/ _g_list_nth_data(long /*int*/ list, int n); -public static final long /*int*/ g_list_nth_data(long /*int*/ list, int n) { +public static final native long _g_list_nth_data(long list, int n); +public static final long g_list_nth_data(long list, int n) { lock.lock(); try { return _g_list_nth_data(list, n); @@ -1858,8 +1858,8 @@ public static final long /*int*/ g_list_nth_data(long /*int*/ list, int n) { * @param list cast=(GList *) * @param data cast=(gpointer) */ -public static final native long /*int*/ _g_list_prepend(long /*int*/ list, long /*int*/ data); -public static final long /*int*/ g_list_prepend(long /*int*/ list, long /*int*/ data) { +public static final native long _g_list_prepend(long list, long data); +public static final long g_list_prepend(long list, long data) { lock.lock(); try { return _g_list_prepend(list, data); @@ -1871,8 +1871,8 @@ public static final long /*int*/ g_list_prepend(long /*int*/ list, long /*int*/ * @param list cast=(GList *) * @param llist cast=(GList *) */ -public static final native void _g_list_set_previous(long /*int*/ list, long /*int*/ llist); -public static final void g_list_set_previous(long /*int*/ list, long /*int*/ llist) { +public static final native void _g_list_set_previous(long list, long llist); +public static final void g_list_set_previous(long list, long llist) { lock.lock(); try { _g_list_set_previous(list, llist); @@ -1880,8 +1880,8 @@ public static final void g_list_set_previous(long /*int*/ list, long /*int*/ lli lock.unlock(); } } -public static final native long /*int*/ _g_list_previous(long /*int*/ list); -public static final long /*int*/ g_list_previous(long /*int*/ list) { +public static final native long _g_list_previous(long list); +public static final long g_list_previous(long list) { lock.lock(); try { return _g_list_previous(list); @@ -1893,8 +1893,8 @@ public static final long /*int*/ g_list_previous(long /*int*/ list) { * @param list cast=(GList *) * @param link cast=(GList *) */ -public static final native long /*int*/ _g_list_remove_link(long /*int*/ list, long /*int*/ link); -public static final long /*int*/ g_list_remove_link(long /*int*/ list, long /*int*/ link) { +public static final native long _g_list_remove_link(long list, long link); +public static final long g_list_remove_link(long list, long link) { lock.lock(); try { return _g_list_remove_link(list, link); @@ -1908,8 +1908,8 @@ public static final long /*int*/ g_list_remove_link(long /*int*/ list, long /*in * @param message cast=(gchar *) * @param unused_data cast=(gpointer) */ -public static final native void _g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data); -public static final void g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data) { +public static final native void _g_log_default_handler(long log_domain, int log_levels, long message, long unused_data); +public static final void g_log_default_handler(long log_domain, int log_levels, long message, long unused_data) { lock.lock(); try { _g_log_default_handler(log_domain, log_levels, message, unused_data); @@ -1936,8 +1936,8 @@ public static final void g_log_remove_handler(byte[] log_domain, int handler_id) * @param log_func cast=(GLogFunc) * @param user_data cast=(gpointer) */ -public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data); -public static final int g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data) { +public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, long log_func, long user_data); +public static final int g_log_set_handler(byte[] log_domain, int log_levels, long log_func, long user_data) { lock.lock(); try { return _g_log_set_handler(log_domain, log_levels, log_func, user_data); @@ -1946,8 +1946,8 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, lon } } /** @param size cast=(gulong) */ -public static final native long /*int*/ _g_malloc(long /*int*/ size); -public static final long /*int*/ g_malloc(long /*int*/ size) { +public static final native long _g_malloc(long size); +public static final long g_malloc(long size) { lock.lock(); try { return _g_malloc(size); @@ -1959,8 +1959,8 @@ public static final long /*int*/ g_malloc(long /*int*/ size) { * @param oclass cast=(GObjectClass *) * @param property_name cast=(const gchar *) */ -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) { +public static final native long _g_object_class_find_property(long oclass, byte[] property_name); +public static final long g_object_class_find_property(long oclass, byte[] property_name) { lock.lock(); try { return _g_object_class_find_property(oclass, property_name); @@ -1973,8 +1973,8 @@ public static final long /*int*/ g_object_class_find_property(long /*int*/ oclas * @param first_property_name cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator); -public static final void g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator) { +public static final native void _g_object_get(long object, byte[] first_property_name, int[] value, long terminator); +public static final void g_object_get(long object, byte[] first_property_name, int[] value, long terminator) { lock.lock(); try { _g_object_get(object, first_property_name, value, terminator); @@ -1987,8 +1987,8 @@ public static final void g_object_get(long /*int*/ object, byte[] first_property * @param first_property_name cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_get(long /*int*/ object, byte[] first_property_name, long[] value, long /*int*/ terminator); -public static final void g_object_get(long /*int*/ object, byte[] first_property_name, long[] value, long /*int*/ terminator) { +public static final native void _g_object_get(long object, byte[] first_property_name, long[] value, long terminator); +public static final void g_object_get(long object, byte[] first_property_name, long[] value, long terminator) { lock.lock(); try { _g_object_get(object, first_property_name, value, terminator); @@ -2000,8 +2000,8 @@ public static final void g_object_get(long /*int*/ object, byte[] first_property * @param object cast=(GObject *) * @param quark cast=(GQuark) */ -public static final native long /*int*/ _g_object_get_qdata(long /*int*/ object, int quark); -public static final long /*int*/ g_object_get_qdata(long /*int*/ object, int quark) { +public static final native long _g_object_get_qdata(long object, int quark); +public static final long g_object_get_qdata(long object, int quark) { lock.lock(); try { return _g_object_get_qdata(object, quark); @@ -2013,8 +2013,8 @@ public static final long /*int*/ g_object_get_qdata(long /*int*/ object, int qua * @param type cast=(GType) * @param first_property_name cast=(const gchar *) */ -public static final native long /*int*/ _g_object_new (long /*int*/ type, long /*int*/ first_property_name); -public static final long /*int*/ g_object_new (long /*int*/ type, long /*int*/ first_property_name) { +public static final native long _g_object_new (long type, long first_property_name); +public static final long g_object_new (long type, long first_property_name) { lock.lock(); try { return _g_object_new(type, first_property_name); @@ -2026,8 +2026,8 @@ public static final long /*int*/ g_object_new (long /*int*/ type, long /*int*/ f * @param object cast=(GObject *) * @param property_name cast=(const gchar *) */ -public static final native void _g_object_notify (long /*int*/ object, byte[] property_name); -public static final void g_object_notify (long /*int*/ object, byte[] property_name) { +public static final native void _g_object_notify (long object, byte[] property_name); +public static final void g_object_notify (long object, byte[] property_name) { lock.lock(); try { _g_object_notify(object, property_name); @@ -2036,8 +2036,8 @@ public static final void g_object_notify (long /*int*/ object, byte[] property_n } } /** @param object cast=(gpointer) */ -public static final native long /*int*/ _g_object_ref(long /*int*/ object); -public static final long /*int*/ g_object_ref(long /*int*/ object) { +public static final native long _g_object_ref(long object); +public static final long g_object_ref(long object) { lock.lock(); try { return _g_object_ref(object); @@ -2050,8 +2050,8 @@ public static final long /*int*/ g_object_ref(long /*int*/ object) { * @param first_property_name cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator); -public static final void g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator) { +public static final native void _g_object_set(long object, byte[] first_property_name, boolean data, long terminator); +public static final void g_object_set(long object, byte[] first_property_name, boolean data, long terminator) { lock.lock(); try { _g_object_set(object, first_property_name, data, terminator); @@ -2064,8 +2064,8 @@ public static final void g_object_set(long /*int*/ object, byte[] first_property * @param first_property_name cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator); -public static final void g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator) { +public static final native void _g_object_set(long object, byte[] first_property_name, byte[] data, long terminator); +public static final void g_object_set(long object, byte[] first_property_name, byte[] data, long terminator) { lock.lock(); try { _g_object_set(object, first_property_name, data, terminator); @@ -2081,8 +2081,8 @@ public static final void g_object_set(long /*int*/ object, byte[] first_property * @param first_property_name cast=(const gchar *) * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, GdkRGBA data, long /*int*/ terminator); -public static final void g_object_set(long /*int*/ object, byte[] first_property_name, GdkRGBA data, long /*int*/ terminator) { +public static final native void _g_object_set(long object, byte[] first_property_name, GdkRGBA data, long terminator); +public static final void g_object_set(long object, byte[] first_property_name, GdkRGBA data, long terminator) { lock.lock(); try { _g_object_set(object, first_property_name, data, terminator); @@ -2096,8 +2096,8 @@ public static final void g_object_set(long /*int*/ object, byte[] first_property * @param first_property_name cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator); -public static final void g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator) { +public static final native void _g_object_set(long object, byte[] first_property_name, int data, long terminator); +public static final void g_object_set(long object, byte[] first_property_name, int data, long terminator) { lock.lock(); try { _g_object_set(object, first_property_name, data, terminator); @@ -2110,8 +2110,8 @@ public static final void g_object_set(long /*int*/ object, byte[] first_property * @param first_property_name cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator); -public static final void g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator) { +public static final native void _g_object_set(long object, byte[] first_property_name, float data, long terminator); +public static final void g_object_set(long object, byte[] first_property_name, float data, long terminator) { lock.lock(); try { _g_object_set(object, first_property_name, data, terminator); @@ -2124,8 +2124,8 @@ public static final void g_object_set(long /*int*/ object, byte[] first_property * @param first_property_name cast=(const gchar *),flags=no_out * @param terminator cast=(const gchar *),flags=sentinel */ -public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator); -public static final void g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator) { +public static final native void _g_object_set(long object, byte[] first_property_name, long data, long terminator); +public static final void g_object_set(long object, byte[] first_property_name, long data, long terminator) { lock.lock(); try { _g_object_set(object, first_property_name, data, terminator); @@ -2138,8 +2138,8 @@ public static final void g_object_set(long /*int*/ object, byte[] first_property * @param quark cast=(GQuark) * @param data cast=(gpointer) */ -public static final native void _g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data); -public static final void g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data) { +public static final native void _g_object_set_qdata(long object, int quark, long data); +public static final void g_object_set_qdata(long object, int quark, long data) { lock.lock(); try { _g_object_set_qdata(object, quark, data); @@ -2148,8 +2148,8 @@ public static final void g_object_set_qdata(long /*int*/ object, int quark, long } } /** @param object cast=(gpointer) */ -public static final native void _g_object_unref(long /*int*/ object); -public static final void g_object_unref(long /*int*/ object) { +public static final native void _g_object_unref(long object); +public static final void g_object_unref(long object) { lock.lock(); try { _g_object_unref(object); @@ -2163,8 +2163,8 @@ public static final void g_object_unref(long /*int*/ object) { * @param data cast=(gconstpointer) * @param size cast=(gsize) */ -public static final native long /*int*/ _g_bytes_new (byte [] data, long /*int*/ size); -public static final long /*int*/ g_bytes_new (byte [] data, long /*int*/ size) { +public static final native long _g_bytes_new (byte [] data, long size); +public static final long g_bytes_new (byte [] data, long size) { lock.lock(); try { return _g_bytes_new (data, size); @@ -2176,8 +2176,8 @@ public static final long /*int*/ g_bytes_new (byte [] data, long /*int*/ size) { /** * @param gBytes cast=(GBytes *) */ -public static final native void _g_bytes_unref (long /*int*/ gBytes); -public static final void g_bytes_unref (long /*int*/ gBytes) { +public static final native void _g_bytes_unref (long gBytes); +public static final void g_bytes_unref (long gBytes) { lock.lock(); try { _g_bytes_unref (gBytes); @@ -2212,8 +2212,8 @@ public static final void g_set_prgname(byte[] prgname) { * @param proc cast=(GCallback) * @param data cast=(gpointer) */ -public static final native int _g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data); -public static final int g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data) { +public static final native int _g_signal_connect(long instance, byte[] detailed_signal, long proc, long data); +public static final int g_signal_connect(long instance, byte[] detailed_signal, long proc, long data) { lock.lock(); try { return _g_signal_connect(instance, detailed_signal, proc, data); @@ -2227,8 +2227,8 @@ public static final int g_signal_connect(long /*int*/ instance, byte[] detailed_ * @param closure cast=(GClosure *) * @param after cast=(gboolean) */ -public static final native int _g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after); -public static final int g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after) { +public static final native int _g_signal_connect_closure(long instance, byte[] detailed_signal, long closure, boolean after); +public static final int g_signal_connect_closure(long instance, byte[] detailed_signal, long closure, boolean after) { lock.lock(); try { return _g_signal_connect_closure(instance, detailed_signal, closure, after); @@ -2243,8 +2243,8 @@ public static final int g_signal_connect_closure(long /*int*/ instance, byte[] d * @param closure cast=(GClosure *) * @param after cast=(gboolean) */ -public static final native int _g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after); -public static final int g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after) { +public static final native int _g_signal_connect_closure_by_id(long instance, int signal_id, int detail, long closure, boolean after); +public static final int g_signal_connect_closure_by_id(long instance, int signal_id, int detail, long closure, boolean after) { lock.lock(); try { return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after); @@ -2256,8 +2256,8 @@ public static final int g_signal_connect_closure_by_id(long /*int*/ instance, in * @param instance cast=(gpointer) * @param detailed_signal cast=(const gchar *),flags=no_out */ -public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal); -public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal) { +public static final native void _g_signal_emit_by_name(long instance, byte[] detailed_signal); +public static final void g_signal_emit_by_name(long instance, byte[] detailed_signal) { lock.lock(); try { _g_signal_emit_by_name(instance, detailed_signal); @@ -2269,8 +2269,8 @@ public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] det * @param instance cast=(gpointer) * @param detailed_signal cast=(const gchar *),flags=no_out */ -public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data); -public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data) { +public static final native void _g_signal_emit_by_name(long instance, byte[] detailed_signal, long data); +public static final void g_signal_emit_by_name(long instance, byte[] detailed_signal, long data) { lock.lock(); try { _g_signal_emit_by_name(instance, detailed_signal, data); @@ -2282,8 +2282,8 @@ public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] det * @param instance cast=(gpointer) * @param detailed_signal cast=(const gchar *),flags=no_out */ -public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, GdkRectangle data); -public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, GdkRectangle data) { +public static final native void _g_signal_emit_by_name(long instance, byte[] detailed_signal, GdkRectangle data); +public static final void g_signal_emit_by_name(long instance, byte[] detailed_signal, GdkRectangle data) { lock.lock(); try { _g_signal_emit_by_name(instance, detailed_signal, data); @@ -2295,8 +2295,8 @@ public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] det * @param instance cast=(gpointer) * @param detailed_signal cast=(const gchar *),flags=no_out */ -public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2); -public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2) { +public static final native void _g_signal_emit_by_name(long instance, byte[] detailed_signal, long data1, long data2); +public static final void g_signal_emit_by_name(long instance, byte[] detailed_signal, long data1, long data2) { lock.lock(); try { _g_signal_emit_by_name(instance, detailed_signal, data1, data2); @@ -2308,8 +2308,8 @@ public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] det * @param instance cast=(gpointer) * @param detailed_signal cast=(const gchar *),flags=no_out */ -public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data); -public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data) { +public static final native void _g_signal_emit_by_name(long instance, byte[] detailed_signal, byte [] data); +public static final void g_signal_emit_by_name(long instance, byte[] detailed_signal, byte [] data) { lock.lock(); try { _g_signal_emit_by_name(instance, detailed_signal, data); @@ -2321,8 +2321,8 @@ public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] det * @param instance cast=(gpointer) * @param handler_id cast=(gulong) */ -public static final native void _g_signal_handler_disconnect(long /*int*/ instance, int handler_id); -public static final void g_signal_handler_disconnect(long /*int*/ instance, int handler_id) { +public static final native void _g_signal_handler_disconnect(long instance, int handler_id); +public static final void g_signal_handler_disconnect(long instance, int handler_id) { lock.lock(); try { _g_signal_handler_disconnect(instance, handler_id); @@ -2337,8 +2337,8 @@ public static final void g_signal_handler_disconnect(long /*int*/ instance, int * @param func cast=(gpointer) * @param data cast=(gpointer) */ -public static final native int _g_signal_handler_find(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data); -public static final int g_signal_handler_find(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) { +public static final native int _g_signal_handler_find(long instance, int mask, int signal_id, int detail, long closure, long func, long data); +public static final int g_signal_handler_find(long instance, int mask, int signal_id, int detail, long closure, long func, long data) { lock.lock(); try { return _g_signal_handler_find(instance, mask, signal_id, detail, closure, func, data); @@ -2355,8 +2355,8 @@ public static final int g_signal_handler_find(long /*int*/ instance, int mask, i * @param func cast=(gpointer) * @param data cast=(gpointer) */ -public static final native int _g_signal_handlers_block_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data); -public static final int g_signal_handlers_block_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) { +public static final native int _g_signal_handlers_block_matched(long instance, int mask, int signal_id, int detail, long closure, long func, long data); +public static final int g_signal_handlers_block_matched(long instance, int mask, int signal_id, int detail, long closure, long func, long data) { lock.lock(); try { return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data); @@ -2373,8 +2373,8 @@ public static final int g_signal_handlers_block_matched(long /*int*/ instance, i * @param func cast=(gpointer) * @param data cast=(gpointer) */ -public static final native int _g_signal_handlers_unblock_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data); -public static final int g_signal_handlers_unblock_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) { +public static final native int _g_signal_handlers_unblock_matched(long instance, int mask, int signal_id, int detail, long closure, long func, long data); +public static final int g_signal_handlers_unblock_matched(long instance, int mask, int signal_id, int detail, long closure, long func, long data) { lock.lock(); try { return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data); @@ -2383,8 +2383,8 @@ public static final int g_signal_handlers_unblock_matched(long /*int*/ instance, } } /** @param name cast=(const gchar *),flags=no_out */ -public static final native int _g_signal_lookup (byte[] name, long /*int*/ itype); -public static final int g_signal_lookup (byte[] name, long /*int*/ itype) { +public static final native int _g_signal_lookup (byte[] name, long itype); +public static final int g_signal_lookup (byte[] name, long itype) { lock.lock(); try { return _g_signal_lookup(name, itype); @@ -2396,8 +2396,8 @@ public static final int g_signal_lookup (byte[] name, long /*int*/ itype) { * @param instance cast=(gpointer) * @param detailed_signal cast=(const gchar *),flags=no_out */ -public static final native void _g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal); -public static final void g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal) { +public static final native void _g_signal_stop_emission_by_name(long instance, byte[] detailed_signal); +public static final void g_signal_stop_emission_by_name(long instance, byte[] detailed_signal) { lock.lock(); try { _g_signal_stop_emission_by_name(instance, detailed_signal); @@ -2406,8 +2406,8 @@ public static final void g_signal_stop_emission_by_name(long /*int*/ instance, b } } /** @param tag cast=(guint) */ -public static final native boolean /*long*/ _g_source_remove (long /*int*/ tag); -public static final boolean /*long*/ g_source_remove (long /*int*/ tag) { +public static final native boolean /*long*/ _g_source_remove (long tag); +public static final boolean /*long*/ g_source_remove (long tag) { lock.lock(); try { return _g_source_remove(tag); @@ -2419,8 +2419,8 @@ public static final boolean /*long*/ g_source_remove (long /*int*/ tag) { * @param list cast=(GSList *) * @param data cast=(gpointer) */ -public static final native long /*int*/ _g_slist_append(long /*int*/ list, long /*int*/ data); -public static final long /*int*/ g_slist_append(long /*int*/ list, long /*int*/ data) { +public static final native long _g_slist_append(long list, long data); +public static final long g_slist_append(long list, long data) { lock.lock(); try { return _g_slist_append(list, data); @@ -2429,8 +2429,8 @@ public static final long /*int*/ g_slist_append(long /*int*/ list, long /*int*/ } } /** @param list cast=(GSList *) */ -public static final native long /*int*/ _g_slist_data (long /*int*/ list); -public static final long /*int*/ g_slist_data (long /*int*/ list) { +public static final native long _g_slist_data (long list); +public static final long g_slist_data (long list) { lock.lock(); try { return _g_slist_data(list); @@ -2439,8 +2439,8 @@ public static final long /*int*/ g_slist_data (long /*int*/ list) { } } /** @param list cast=(GSList *) */ -public static final native void _g_slist_free (long /*int*/ list); -public static final void g_slist_free (long /*int*/ list) { +public static final native void _g_slist_free (long list); +public static final void g_slist_free (long list) { lock.lock(); try { _g_slist_free(list); @@ -2449,8 +2449,8 @@ public static final void g_slist_free (long /*int*/ list) { } } /** @param list cast=(GSList *) */ -public static final native long /*int*/ _g_slist_next (long /*int*/ list); -public static final long /*int*/ g_slist_next (long /*int*/ list) { +public static final native long _g_slist_next (long list); +public static final long g_slist_next (long list) { lock.lock(); try { return _g_slist_next(list); @@ -2459,8 +2459,8 @@ public static final long /*int*/ g_slist_next (long /*int*/ list) { } } /** @param list cast=(GSList *) */ -public static final native int _g_slist_length (long /*int*/ list); -public static final int g_slist_length (long /*int*/ list) { +public static final native int _g_slist_length (long list); +public static final int g_slist_length (long list) { lock.lock(); try { return _g_slist_length(list); @@ -2469,8 +2469,8 @@ public static final int g_slist_length (long /*int*/ list) { } } /** @param string_array cast=(gchar **) */ -public static final native void _g_strfreev(long /*int*/ string_array); -public static final void g_strfreev(long /*int*/ string_array) { +public static final native void _g_strfreev(long string_array); +public static final void g_strfreev(long string_array) { lock.lock(); try { _g_strfreev(string_array); @@ -2482,8 +2482,8 @@ public static final void g_strfreev(long /*int*/ string_array) { * @method flags=getter * @param string cast=(GString *) */ -public static final native int _GString_len(long /*int*/ string); -public static final int GString_len(long /*int*/ string) { +public static final native int _GString_len(long string); +public static final int GString_len(long string) { lock.lock(); try { return _GString_len(string); @@ -2495,8 +2495,8 @@ public static final int GString_len(long /*int*/ string) { * @method flags=getter * @param string cast=(GString *) */ -public static final native long /*int*/ _GString_str(long /*int*/ string); -public static final long /*int*/ GString_str(long /*int*/ string) { +public static final native long _GString_str(long string); +public static final long GString_str(long string) { lock.lock(); try { return _GString_str(string); @@ -2508,9 +2508,9 @@ public static final long /*int*/ GString_str(long /*int*/ string) { /** * @param init cast=(const gchar *) */ -public static final native long /*int*/ _g_string_new_len(long /*int*/ init, long /*int*/ gssize); +public static final native long _g_string_new_len(long init, long gssize); /** GString * g_string_new_len (const gchar *init, gssize len); */ -public static final long /*int*/ g_string_new_len(long /*int*/ init, long /*int*/ gssize) { +public static final long g_string_new_len(long init, long gssize) { lock.lock(); try { return _g_string_new_len(init, gssize); @@ -2522,9 +2522,9 @@ public static final long /*int*/ g_string_new_len(long /*int*/ init, long /*int* /** * @param GString cast=(GString *) */ -public static final native long /*int*/ _g_string_free(long /*int*/ GString, int gboolen_free_segment); +public static final native long _g_string_free(long GString, int gboolen_free_segment); /** gchar * g_string_free (GString *string, gboolean free_segment);*/ -public static final long /*int*/ g_string_free(long /*int*/ GString, int gboolen_free_segment) { +public static final long g_string_free(long GString, int gboolen_free_segment) { lock.lock(); try { return _g_string_free(GString, gboolen_free_segment); @@ -2537,8 +2537,8 @@ public static final long /*int*/ g_string_free(long /*int*/ GString, int gboolen * @param str cast=(const gchar *) * @param endptr cast=(gchar **) */ -public static final native double _g_strtod(long /*int*/ str, long /*int*/[] endptr); -public static final double g_strtod(long /*int*/ str, long /*int*/[] endptr) { +public static final native double _g_strtod(long str, long /*int*/[] endptr); +public static final double g_strtod(long str, long /*int*/[] endptr) { lock.lock(); try { return _g_strtod(str, endptr); @@ -2547,14 +2547,14 @@ public static final double g_strtod(long /*int*/ str, long /*int*/[] endptr) { } } /** @param str cast=(char *) */ -public static final native long /*int*/ g_strdup (long /*int*/ str); +public static final native long g_strdup (long str); /** * @param instance_type cast=(GType) * @param interface_type cast=(GType) * @param info cast=(const GInterfaceInfo *) */ -public static final native void _g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info); -public static final void g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info) { +public static final native void _g_type_add_interface_static (long instance_type, long interface_type, long info); +public static final void g_type_add_interface_static (long instance_type, long interface_type, long info) { lock.lock(); try { _g_type_add_interface_static(instance_type, interface_type, info); @@ -2563,8 +2563,8 @@ public static final void g_type_add_interface_static (long /*int*/ instance_type } } /** @param g_class cast=(GType) */ -public static final native long /*int*/ _g_type_class_peek (long /*int*/ g_class); -public static final long /*int*/ g_type_class_peek (long /*int*/ g_class) { +public static final native long _g_type_class_peek (long g_class); +public static final long g_type_class_peek (long g_class) { lock.lock(); try { return _g_type_class_peek(g_class); @@ -2573,8 +2573,8 @@ public static final long /*int*/ g_type_class_peek (long /*int*/ g_class) { } } /** @param g_class cast=(gpointer) */ -public static final native long /*int*/ _g_type_class_peek_parent (long /*int*/ g_class); -public static final long /*int*/ g_type_class_peek_parent (long /*int*/ g_class) { +public static final native long _g_type_class_peek_parent (long g_class); +public static final long g_type_class_peek_parent (long g_class) { lock.lock(); try { return _g_type_class_peek_parent(g_class); @@ -2583,8 +2583,8 @@ public static final long /*int*/ g_type_class_peek_parent (long /*int*/ g_class) } } /** @param g_class cast=(GType) */ -public static final native long /*int*/ _g_type_class_ref (long /*int*/ g_class); -public static final long /*int*/ g_type_class_ref (long /*int*/ g_class) { +public static final native long _g_type_class_ref (long g_class); +public static final long g_type_class_ref (long g_class) { lock.lock(); try { return _g_type_class_ref(g_class); @@ -2593,8 +2593,8 @@ public static final long /*int*/ g_type_class_ref (long /*int*/ g_class) { } } /** @param g_class cast=(gpointer) */ -public static final native void _g_type_class_unref (long /*int*/ g_class); -public static final void g_type_class_unref (long /*int*/ g_class) { +public static final native void _g_type_class_unref (long g_class); +public static final void g_type_class_unref (long g_class) { lock.lock(); try { _g_type_class_unref(g_class); @@ -2603,8 +2603,8 @@ public static final void g_type_class_unref (long /*int*/ g_class) { } } /** @param iface cast=(gpointer) */ -public static final native long /*int*/ _g_type_interface_peek_parent (long /*int*/ iface); -public static final long /*int*/ g_type_interface_peek_parent (long /*int*/ iface) { +public static final native long _g_type_interface_peek_parent (long iface); +public static final long g_type_interface_peek_parent (long iface) { lock.lock(); try { return _g_type_interface_peek_parent(iface); @@ -2616,8 +2616,8 @@ public static final long /*int*/ g_type_interface_peek_parent (long /*int*/ ifac * @param type cast=(GType) * @param is_a_type cast=(GType) */ -public static final native boolean _g_type_is_a (long /*int*/ type, long /*int*/ is_a_type); -public static final boolean g_type_is_a (long /*int*/ type, long /*int*/ is_a_type) { +public static final native boolean _g_type_is_a (long type, long is_a_type); +public static final boolean g_type_is_a (long type, long is_a_type) { lock.lock(); try { return _g_type_is_a(type, is_a_type); @@ -2626,8 +2626,8 @@ public static final boolean g_type_is_a (long /*int*/ type, long /*int*/ is_a_ty } } /** @param type cast=(GType) */ -public static final native long /*int*/ _g_type_parent (long /*int*/ type); -public static final long /*int*/ g_type_parent (long /*int*/ type) { +public static final native long _g_type_parent (long type); +public static final long g_type_parent (long type) { lock.lock(); try { return _g_type_parent(type); @@ -2639,8 +2639,8 @@ public static final long /*int*/ g_type_parent (long /*int*/ type) { * @param type cast=(GType) * @param query cast=(GTypeQuery *) */ -public static final native void _g_type_query (long /*int*/ type, long /*int*/ query); -public static final void g_type_query (long /*int*/ type, long /*int*/ query) { +public static final native void _g_type_query (long type, long query); +public static final void g_type_query (long type, long query) { lock.lock(); try { _g_type_query(type, query); @@ -2654,8 +2654,8 @@ public static final void g_type_query (long /*int*/ type, long /*int*/ query) { * @param info cast=(const GTypeInfo *) * @param flags cast=(GTypeFlags) */ -public static final native long /*int*/ _g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags); -public static final long /*int*/ g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags) { +public static final native long _g_type_register_static (long parent_type, byte[] type_name, long info, int flags); +public static final long g_type_register_static (long parent_type, byte[] type_name, long info, int flags) { lock.lock(); try { return _g_type_register_static(parent_type, type_name, info, flags); @@ -2670,8 +2670,8 @@ public static final long /*int*/ g_type_register_static (long /*int*/ parent_typ * @param items_written cast=(glong *),flags=critical * @param error cast=(GError **),flags=critical */ -public static final native long /*int*/ _g_utf16_to_utf8(char[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error); -public static final long /*int*/ g_utf16_to_utf8(char[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { +public static final native long _g_utf16_to_utf8(char[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error); +public static final long g_utf16_to_utf8(char[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { lock.lock(); try { return _g_utf16_to_utf8(str, len, items_read, items_written, error); @@ -2683,8 +2683,8 @@ public static final long /*int*/ g_utf16_to_utf8(char[] str, long /*int*/ len, l * @param str cast=(const gchar *) * @param pos cast=(const gchar *) */ -public static final native long /*int*/ _g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos); -public static final long /*int*/ g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos) { +public static final native long _g_utf8_pointer_to_offset(long str, long pos); +public static final long g_utf8_pointer_to_offset(long str, long pos) { lock.lock(); try { return _g_utf8_pointer_to_offset(str, pos); @@ -2693,8 +2693,8 @@ public static final long /*int*/ g_utf8_pointer_to_offset(long /*int*/ str, long } } /** @param str cast=(const gchar *) */ -public static final native long /*int*/ _g_utf8_strlen(long /*int*/ str, long /*int*/ max); -public static final long /*int*/ g_utf8_strlen(long /*int*/ str, long /*int*/ max) { +public static final native long _g_utf8_strlen(long str, long max); +public static final long g_utf8_strlen(long str, long max) { lock.lock(); try { return _g_utf8_strlen(str, max); @@ -2709,8 +2709,8 @@ public static final long /*int*/ g_utf8_strlen(long /*int*/ str, long /*int*/ ma * @param items_written cast=(glong *),flags=critical * @param error cast=(GError **),flags=critical */ -public static final native long /*int*/ _g_utf8_to_utf16(byte[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error); -public static final long /*int*/ g_utf8_to_utf16(byte[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { +public static final native long _g_utf8_to_utf16(byte[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error); +public static final long g_utf8_to_utf16(byte[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { lock.lock(); try { return _g_utf8_to_utf16(str, len, items_read, items_written, error); @@ -2725,8 +2725,8 @@ public static final long /*int*/ g_utf8_to_utf16(byte[] str, long /*int*/ len, l * @param items_written cast=(glong *),flags=critical * @param error cast=(GError **),flags=critical */ -public static final native long /*int*/ _g_utf8_to_utf16(long /*int*/ str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error); -public static final long /*int*/ g_utf8_to_utf16(long /*int*/ str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { +public static final native long _g_utf8_to_utf16(long str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error); +public static final long g_utf8_to_utf16(long str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { lock.lock(); try { return _g_utf8_to_utf16(str, len, items_read, items_written, error); @@ -2738,28 +2738,28 @@ public static final long /*int*/ g_utf8_to_utf16(long /*int*/ str, long /*int*/ * @param value cast=(GValue *) * @param type cast=(GType) */ -public static final native long /*int*/ g_value_init (long /*int*/ value, long /*int*/ type); +public static final native long g_value_init (long value, long type); /** @param value cast=(GValue *) */ -public static final native int g_value_get_int (long /*int*/ value); +public static final native int g_value_get_int (long value); /** @param value cast=(GValue *) */ -public static final native void g_value_set_int (long /*int*/ value, int v); +public static final native void g_value_set_int (long value, int v); /** @param value cast=(GValue *) */ -public static final native double g_value_get_double (long /*int*/ value); +public static final native double g_value_get_double (long value); /** @param value cast=(GValue *) */ -public static final native void g_value_set_double (long /*int*/ value, double v); +public static final native void g_value_set_double (long value, double v); /** @param value cast=(GValue *) */ -public static final native float g_value_get_float (long /*int*/ value); +public static final native float g_value_get_float (long value); /** @param value cast=(GValue *) */ -public static final native void g_value_set_float (long /*int*/ value, float v); +public static final native void g_value_set_float (long value, float v); /** @param value cast=(GValue *) */ -public static final native long g_value_get_int64 (long /*int*/ value); +public static final native long g_value_get_int64 (long value); /** @param value cast=(GValue *) */ -public static final native void g_value_set_int64 (long /*int*/ value, long v); +public static final native void g_value_set_int64 (long value, long v); /** @param value cast=(GValue *) */ -public static final native void g_value_unset (long /*int*/ value); +public static final native void g_value_unset (long value); /** @param value cast=(const GValue *) */ -public static final native long /*int*/ _g_value_peek_pointer (long /*int*/ value); -public static final long /*int*/ g_value_peek_pointer (long /*int*/ value) { +public static final native long _g_value_peek_pointer (long value); +public static final long g_value_peek_pointer (long value) { lock.lock(); try { return _g_value_peek_pointer(value); @@ -2804,8 +2804,8 @@ public static final int glib_micro_version() { * @param function cast=(GSourceFunc) * @param data cast=(gpointer) */ -public static final native int _g_timeout_add(int interval, long /*int*/ function, long /*int*/ data); -public static final int g_timeout_add(int interval, long /*int*/ function, long /*int*/ data) { +public static final native int _g_timeout_add(int interval, long function, long data); +public static final int g_timeout_add(int interval, long function, long data) { lock.lock(); try { return _g_timeout_add(interval, function, data); @@ -2815,8 +2815,8 @@ public static final int g_timeout_add(int interval, long /*int*/ function, long } /** @method flags=dynamic */ -public static final native boolean _FcConfigAppFontAddFile(long /*int*/ config, byte[] file); -public static final boolean FcConfigAppFontAddFile(long /*int*/ config, byte[] file) { +public static final native boolean _FcConfigAppFontAddFile(long config, byte[] file); +public static final boolean FcConfigAppFontAddFile(long config, byte[] file) { lock.lock(); try { return _FcConfigAppFontAddFile(config, file); @@ -2844,176 +2844,170 @@ public static final int getpid() { * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, GInterfaceInfo src, int size); +public static final native void memmove(long dest, GInterfaceInfo src, int size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *),flags=no_out */ -public static final native void memmove(long /*int*/ dest, GObjectClass src); +public static final native void memmove(long dest, GObjectClass src); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, GTypeInfo src, int size); +public static final native void memmove(long dest, GTypeInfo src, int size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, GtkTargetEntry src, long /*int*/ size); +public static final native void memmove(long dest, GtkTargetEntry src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, GdkRGBA src, long /*int*/ size); +public static final native void memmove(long dest, GdkRGBA src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, GdkEventButton src, long /*int*/ size); +public static final native void memmove(long dest, GdkEventButton src, long size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, GdkEventKey src, long /*int*/ size); +public static final native void memmove(long dest, GdkEventKey src, long size); /** @param src flags=no_out */ -public static final native void memmove(long /*int*/ dest, GtkWidgetClass src); +public static final native void memmove(long dest, GtkWidgetClass src); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove(long /*int*/ dest, PangoAttribute src, long /*int*/ size); +public static final native void memmove(long dest, PangoAttribute src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) */ -public static final native void memmove(GObjectClass dest, long /*int*/ src); -/** - * @param dest cast=(void *),flags=no_in - * @param src cast=(const void *) - * @param size cast=(size_t) - */ -public static final native void memmove(GTypeQuery dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GTypeQuery dest, long src, long size); /** @param dest flags=no_in */ -public static final native void memmove(GtkWidgetClass dest, long /*int*/ src); +public static final native void memmove(GtkWidgetClass dest, long src); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GtkBorder dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GtkBorder dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkKeymapKey dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkKeymapKey dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkRGBA dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkRGBA dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkEventButton dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkEventButton dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkEventCrossing dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkEventCrossing dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkEventExpose dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkEventExpose dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkEventFocus dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkEventFocus dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkEventKey dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkEventKey dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkEventMotion dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkEventMotion dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkEventWindowState dest, long /*int*/ src, long /*int*/ size); -public static final native void memmove(long /*int*/ dest, GtkCellRendererClass src); -public static final native void memmove(GtkCellRendererClass dest, long /*int*/ src); +public static final native void memmove(GdkEventWindowState dest, long src, long size); +public static final native void memmove(long dest, GtkCellRendererClass src); +public static final native void memmove(GtkCellRendererClass dest, long src); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(GdkRectangle dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(GdkRectangle dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(PangoAttribute dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(PangoAttribute dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(PangoAttrColor dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(PangoAttrColor dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(PangoAttrInt dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(PangoAttrInt dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(PangoItem dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(PangoItem dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(PangoLayoutLine dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(PangoLayoutLine dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(PangoLayoutRun dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(PangoLayoutRun dest, long src, long size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) * @param size cast=(size_t) */ -public static final native void memmove(PangoLogAttr dest, long /*int*/ src, long /*int*/ size); +public static final native void memmove(PangoLogAttr dest, long src, long size); /** @param attribute cast=(const PangoAttribute *) */ -public static final native long /*int*/ _pango_attribute_copy (long /*int*/ attribute); -public static final long /*int*/ pango_attribute_copy (long /*int*/ attribute) { +public static final native long _pango_attribute_copy (long attribute); +public static final long pango_attribute_copy (long attribute) { lock.lock(); try { return _pango_attribute_copy(attribute); @@ -3015,8 +3015,8 @@ public static final long /*int*/ pango_attribute_copy (long /*int*/ attribute) { lock.unlock(); } } -public static final native long /*int*/ _pango_attr_background_new (short red, short green, short blue); -public static final long /*int*/ pango_attr_background_new (short red, short green, short blue) { +public static final native long _pango_attr_background_new (short red, short green, short blue); +public static final long pango_attr_background_new (short red, short green, short blue) { lock.lock(); try { return _pango_attr_background_new(red, green, blue); @@ -3025,8 +3025,8 @@ public static final long /*int*/ pango_attr_background_new (short red, short gre } } /** @param desc cast=(const PangoFontDescription *) */ -public static final native long /*int*/ _pango_attr_font_desc_new(long /*int*/ desc); -public static final long /*int*/ pango_attr_font_desc_new(long /*int*/ desc) { +public static final native long _pango_attr_font_desc_new(long desc); +public static final long pango_attr_font_desc_new(long desc) { lock.lock(); try { return _pango_attr_font_desc_new(desc); @@ -3034,8 +3034,8 @@ public static final long /*int*/ pango_attr_font_desc_new(long /*int*/ desc) { lock.unlock(); } } -public static final native long /*int*/ _pango_attr_foreground_new (short red, short green, short blue); -public static final long /*int*/ pango_attr_foreground_new (short red, short green, short blue) { +public static final native long _pango_attr_foreground_new (short red, short green, short blue); +public static final long pango_attr_foreground_new (short red, short green, short blue) { lock.lock(); try { return _pango_attr_foreground_new(red, green, blue); @@ -3043,8 +3043,8 @@ public static final long /*int*/ pango_attr_foreground_new (short red, short gre lock.unlock(); } } -public static final native long /*int*/ _pango_attr_rise_new(int rise); -public static final long /*int*/ pango_attr_rise_new(int rise) { +public static final native long _pango_attr_rise_new(int rise); +public static final long pango_attr_rise_new(int rise) { lock.lock(); try { return _pango_attr_rise_new(rise); @@ -3056,8 +3056,8 @@ public static final long /*int*/ pango_attr_rise_new(int rise) { * @param ink_rect flags=no_out * @param logical_rect flags=no_out */ -public static final native long /*int*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect); -public static final long /*int*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) { +public static final native long _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect); +public static final long pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) { lock.lock(); try { return _pango_attr_shape_new(ink_rect, logical_rect); @@ -3069,8 +3069,8 @@ public static final long /*int*/ pango_attr_shape_new(PangoRectangle ink_rect, P * @param list cast=(PangoAttrList *) * @param attr cast=(PangoAttribute *) */ -public static final native void _pango_attr_list_insert(long /*int*/ list, long /*int*/ attr); -public static final void pango_attr_list_insert(long /*int*/ list, long /*int*/ attr) { +public static final native void _pango_attr_list_insert(long list, long attr); +public static final void pango_attr_list_insert(long list, long attr) { lock.lock(); try { _pango_attr_list_insert(list, attr); @@ -3079,8 +3079,8 @@ public static final void pango_attr_list_insert(long /*int*/ list, long /*int*/ } } /** @param list cast=(PangoAttrList *) */ -public static final native long /*int*/ _pango_attr_list_get_iterator(long /*int*/ list); -public static final long /*int*/ pango_attr_list_get_iterator(long /*int*/ list) { +public static final native long _pango_attr_list_get_iterator(long list); +public static final long pango_attr_list_get_iterator(long list) { lock.lock(); try { return _pango_attr_list_get_iterator(list); @@ -3089,8 +3089,8 @@ public static final long /*int*/ pango_attr_list_get_iterator(long /*int*/ list) } } /** @param iterator cast=(PangoAttrIterator *) */ -public static final native boolean _pango_attr_iterator_next(long /*int*/ iterator); -public static final boolean pango_attr_iterator_next(long /*int*/ iterator) { +public static final native boolean _pango_attr_iterator_next(long iterator); +public static final boolean pango_attr_iterator_next(long iterator) { lock.lock(); try { return _pango_attr_iterator_next(iterator); @@ -3103,8 +3103,8 @@ public static final boolean pango_attr_iterator_next(long /*int*/ iterator) { * @param start cast=(gint *) * @param end cast=(gint *) */ -public static final native void _pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end); -public static final void pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end) { +public static final native void _pango_attr_iterator_range(long iterator, int[] start, int[] end); +public static final void pango_attr_iterator_range(long iterator, int[] start, int[] end) { lock.lock(); try { _pango_attr_iterator_range(iterator, start, end); @@ -3116,8 +3116,8 @@ public static final void pango_attr_iterator_range(long /*int*/ iterator, int[] * @param iterator cast=(PangoAttrIterator *) * @param type cast=(PangoAttrType) */ -public static final native long /*int*/ _pango_attr_iterator_get(long /*int*/ iterator, int type); -public static final long /*int*/ pango_attr_iterator_get(long /*int*/ iterator, int type) { +public static final native long _pango_attr_iterator_get(long iterator, int type); +public static final long pango_attr_iterator_get(long iterator, int type) { lock.lock(); try { return _pango_attr_iterator_get(iterator, type); @@ -3126,8 +3126,8 @@ public static final long /*int*/ pango_attr_iterator_get(long /*int*/ iterator, } } /** @param iterator cast=(PangoAttrIterator *) */ -public static final native void _pango_attr_iterator_destroy(long /*int*/ iterator); -public static final void pango_attr_iterator_destroy(long /*int*/ iterator) { +public static final native void _pango_attr_iterator_destroy(long iterator); +public static final void pango_attr_iterator_destroy(long iterator) { lock.lock(); try { _pango_attr_iterator_destroy(iterator); @@ -3135,8 +3135,8 @@ public static final void pango_attr_iterator_destroy(long /*int*/ iterator) { lock.unlock(); } } -public static final native long /*int*/ _pango_attr_list_new(); -public static final long /*int*/ pango_attr_list_new() { +public static final native long _pango_attr_list_new(); +public static final long pango_attr_list_new() { lock.lock(); try { return _pango_attr_list_new(); @@ -3145,8 +3145,8 @@ public static final long /*int*/ pango_attr_list_new() { } } /** @param list cast=(PangoAttrList *) */ -public static final native void _pango_attr_list_unref(long /*int*/ list); -public static final void pango_attr_list_unref(long /*int*/ list) { +public static final native void _pango_attr_list_unref(long list); +public static final void pango_attr_list_unref(long list) { lock.lock(); try { _pango_attr_list_unref(list); @@ -3154,8 +3154,8 @@ public static final void pango_attr_list_unref(long /*int*/ list) { lock.unlock(); } } -public static final native long /*int*/ _pango_attr_strikethrough_color_new(short red, short green, short blue); -public static final long /*int*/ pango_attr_strikethrough_color_new(short red, short green, short blue) { +public static final native long _pango_attr_strikethrough_color_new(short red, short green, short blue); +public static final long pango_attr_strikethrough_color_new(short red, short green, short blue) { lock.lock(); try { return _pango_attr_strikethrough_color_new(red, green, blue); @@ -3163,8 +3163,8 @@ public static final long /*int*/ pango_attr_strikethrough_color_new(short red, s lock.unlock(); } } -public static final native long /*int*/ _pango_attr_strikethrough_new(boolean strikethrough); -public static final long /*int*/ pango_attr_strikethrough_new(boolean strikethrough) { +public static final native long _pango_attr_strikethrough_new(boolean strikethrough); +public static final long pango_attr_strikethrough_new(boolean strikethrough) { lock.lock(); try { return _pango_attr_strikethrough_new(strikethrough); @@ -3172,8 +3172,8 @@ public static final long /*int*/ pango_attr_strikethrough_new(boolean strikethro lock.unlock(); } } -public static final native long /*int*/ _pango_attr_underline_color_new(short red, short green, short blue); -public static final long /*int*/ pango_attr_underline_color_new(short red, short green, short blue) { +public static final native long _pango_attr_underline_color_new(short red, short green, short blue); +public static final long pango_attr_underline_color_new(short red, short green, short blue) { lock.lock(); try { return _pango_attr_underline_color_new(red, green, blue); @@ -3181,8 +3181,8 @@ public static final long /*int*/ pango_attr_underline_color_new(short red, short lock.unlock(); } } -public static final native long /*int*/ _pango_attr_underline_new(int underline); -public static final long /*int*/ pango_attr_underline_new(int underline) { +public static final native long _pango_attr_underline_new(int underline); +public static final long pango_attr_underline_new(int underline) { lock.lock(); try { return _pango_attr_underline_new(underline); @@ -3190,8 +3190,8 @@ public static final long /*int*/ pango_attr_underline_new(int underline) { lock.unlock(); } } -public static final native long /*int*/ _pango_attr_weight_new(int weight); -public static final long /*int*/ pango_attr_weight_new(int weight) { +public static final native long _pango_attr_weight_new(int weight); +public static final long pango_attr_weight_new(int weight) { lock.lock(); try { return _pango_attr_weight_new(weight); @@ -3202,8 +3202,8 @@ public static final long /*int*/ pango_attr_weight_new(int weight) { /** * @param cairo cast=(cairo_t *) */ -public static final native long /*int*/ _pango_cairo_create_layout(long /*int*/ cairo); -public static final long /*int*/ pango_cairo_create_layout(long /*int*/ cairo) { +public static final native long _pango_cairo_create_layout(long cairo); +public static final long pango_cairo_create_layout(long cairo) { lock.lock(); try { return _pango_cairo_create_layout(cairo); @@ -3211,8 +3211,8 @@ public static final long /*int*/ pango_cairo_create_layout(long /*int*/ cairo) { lock.unlock(); } } -public static final native long /*int*/ _pango_cairo_font_map_get_default(); -public static final long /*int*/ pango_cairo_font_map_get_default() { +public static final native long _pango_cairo_font_map_get_default(); +public static final long pango_cairo_font_map_get_default() { lock.lock(); try { return _pango_cairo_font_map_get_default(); @@ -3223,8 +3223,8 @@ public static final long /*int*/ pango_cairo_font_map_get_default() { /** * @param context cast=(PangoContext *) */ -public static final native long /*int*/ _pango_cairo_context_get_font_options(long /*int*/ context); -public static final long /*int*/ pango_cairo_context_get_font_options(long /*int*/ context) { +public static final native long _pango_cairo_context_get_font_options(long context); +public static final long pango_cairo_context_get_font_options(long context) { lock.lock(); try { return _pango_cairo_context_get_font_options(context); @@ -3236,8 +3236,8 @@ public static final long /*int*/ pango_cairo_context_get_font_options(long /*int * @param context cast=(PangoContext *) * @param options cast=( cairo_font_options_t *) */ -public static final native void _pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options); -public static final void pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options) { +public static final native void _pango_cairo_context_set_font_options(long context, long options); +public static final void pango_cairo_context_set_font_options(long context, long options) { lock.lock(); try { _pango_cairo_context_set_font_options(context, options); @@ -3249,8 +3249,8 @@ public static final void pango_cairo_context_set_font_options(long /*int*/ conte * @param cairo cast=(cairo_t *) * @param layout cast=(PangoLayout *) */ -public static final native void _pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout); -public static final void pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout) { +public static final native void _pango_cairo_layout_path(long cairo, long layout); +public static final void pango_cairo_layout_path(long cairo, long layout) { lock.lock(); try { _pango_cairo_layout_path(cairo, layout); @@ -3262,8 +3262,8 @@ public static final void pango_cairo_layout_path(long /*int*/ cairo, long /*int* * @param cairo cast=(cairo_t *) * @param layout cast=(PangoLayout *) */ -public static final native void _pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout); -public static final void pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout) { +public static final native void _pango_cairo_show_layout(long cairo, long layout); +public static final void pango_cairo_show_layout(long cairo, long layout) { lock.lock(); try { _pango_cairo_show_layout(cairo, layout); @@ -3272,8 +3272,8 @@ public static final void pango_cairo_show_layout(long /*int*/ cairo, long /*int* } } /** @param context cast=(PangoContext *) */ -public static final native int _pango_context_get_base_dir(long /*int*/ context); -public static final int pango_context_get_base_dir(long /*int*/ context) { +public static final native int _pango_context_get_base_dir(long context); +public static final int pango_context_get_base_dir(long context) { lock.lock(); try { return _pango_context_get_base_dir(context); @@ -3282,8 +3282,8 @@ public static final int pango_context_get_base_dir(long /*int*/ context) { } } /** @param context cast=(PangoContext *) */ -public static final native long /*int*/ _pango_context_get_language(long /*int*/ context); -public static final long /*int*/ pango_context_get_language(long /*int*/ context) { +public static final native long _pango_context_get_language(long context); +public static final long pango_context_get_language(long context) { lock.lock(); try { return _pango_context_get_language(context); @@ -3296,8 +3296,8 @@ public static final long /*int*/ pango_context_get_language(long /*int*/ context * @param desc cast=(const PangoFontDescription *) * @param language cast=(PangoLanguage *) */ -public static final native long /*int*/ _pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language); -public static final long /*int*/ pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language) { +public static final native long _pango_context_get_metrics(long context, long desc, long language); +public static final long pango_context_get_metrics(long context, long desc, long language) { lock.lock(); try { return _pango_context_get_metrics(context, desc, language); @@ -3310,8 +3310,8 @@ public static final long /*int*/ pango_context_get_metrics(long /*int*/ context, * @param families cast=(PangoFontFamily ***) * @param n_families cast=(int *) */ -public static final native void _pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families); -public static final void pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families) { +public static final native void _pango_context_list_families(long context, long /*int*/[] families, int[] n_families); +public static final void pango_context_list_families(long context, long /*int*/[] families, int[] n_families) { lock.lock(); try { _pango_context_list_families(context, families, n_families); @@ -3320,8 +3320,8 @@ public static final void pango_context_list_families(long /*int*/ context, long } } /** @param context cast=(PangoContext *) */ -public static final native void _pango_context_set_base_dir(long /*int*/ context, int direction); -public static final void pango_context_set_base_dir(long /*int*/ context, int direction) { +public static final native void _pango_context_set_base_dir(long context, int direction); +public static final void pango_context_set_base_dir(long context, int direction) { lock.lock(); try { _pango_context_set_base_dir(context, direction); @@ -3333,8 +3333,8 @@ public static final void pango_context_set_base_dir(long /*int*/ context, int di * @param context cast=(PangoContext *) * @param language cast=(PangoLanguage *) */ -public static final native void _pango_context_set_language(long /*int*/ context, long /*int*/ language); -public static final void pango_context_set_language(long /*int*/ context, long /*int*/ language) { +public static final native void _pango_context_set_language(long context, long language); +public static final void pango_context_set_language(long context, long language) { lock.lock(); try { _pango_context_set_language(context, language); @@ -3343,8 +3343,8 @@ public static final void pango_context_set_language(long /*int*/ context, long / } } /** @param desc cast=(PangoFontDescription *) */ -public static final native long /*int*/ _pango_font_description_copy(long /*int*/ desc); -public static final long /*int*/ pango_font_description_copy(long /*int*/ desc) { +public static final native long _pango_font_description_copy(long desc); +public static final long pango_font_description_copy(long desc) { lock.lock(); try { return _pango_font_description_copy(desc); @@ -3353,8 +3353,8 @@ public static final long /*int*/ pango_font_description_copy(long /*int*/ desc) } } /** @param desc cast=(PangoFontDescription *) */ -public static final native void _pango_font_description_free(long /*int*/ desc); -public static final void pango_font_description_free(long /*int*/ desc) { +public static final native void _pango_font_description_free(long desc); +public static final void pango_font_description_free(long desc) { lock.lock(); try { _pango_font_description_free(desc); @@ -3363,8 +3363,8 @@ public static final void pango_font_description_free(long /*int*/ desc) { } } /** @param str cast=(const char *),flags=no_out critical */ -public static final native long /*int*/ _pango_font_description_from_string(byte[] str); -public static final long /*int*/ pango_font_description_from_string(byte[] str) { +public static final native long _pango_font_description_from_string(byte[] str); +public static final long pango_font_description_from_string(byte[] str) { lock.lock(); try { return _pango_font_description_from_string(str); @@ -3373,8 +3373,8 @@ public static final long /*int*/ pango_font_description_from_string(byte[] str) } } /** @param desc cast=(PangoFontDescription *) */ -public static final native long /*int*/ _pango_font_description_get_family(long /*int*/ desc); -public static final long /*int*/ pango_font_description_get_family(long /*int*/ desc) { +public static final native long _pango_font_description_get_family(long desc); +public static final long pango_font_description_get_family(long desc) { lock.lock(); try { return _pango_font_description_get_family(desc); @@ -3383,8 +3383,8 @@ public static final long /*int*/ pango_font_description_get_family(long /*int*/ } } /** @param desc cast=(PangoFontDescription *) */ -public static final native int _pango_font_description_get_size(long /*int*/ desc); -public static final int pango_font_description_get_size(long /*int*/ desc) { +public static final native int _pango_font_description_get_size(long desc); +public static final int pango_font_description_get_size(long desc) { lock.lock(); try { return _pango_font_description_get_size(desc); @@ -3393,8 +3393,8 @@ public static final int pango_font_description_get_size(long /*int*/ desc) { } } /** @param desc cast=(PangoFontDescription *) */ -public static final native int _pango_font_description_get_stretch(long /*int*/ desc); -public static final int pango_font_description_get_stretch(long /*int*/ desc) { +public static final native int _pango_font_description_get_stretch(long desc); +public static final int pango_font_description_get_stretch(long desc) { lock.lock(); try { return _pango_font_description_get_stretch(desc); @@ -3403,8 +3403,8 @@ public static final int pango_font_description_get_stretch(long /*int*/ desc) { } } /** @param desc cast=(PangoFontDescription *) */ -public static final native int _pango_font_description_get_variant(long /*int*/ desc); -public static final int pango_font_description_get_variant(long /*int*/ desc) { +public static final native int _pango_font_description_get_variant(long desc); +public static final int pango_font_description_get_variant(long desc) { lock.lock(); try { return _pango_font_description_get_variant(desc); @@ -3413,8 +3413,8 @@ public static final int pango_font_description_get_variant(long /*int*/ desc) { } } /** @param desc cast=(PangoFontDescription *) */ -public static final native int _pango_font_description_get_style(long /*int*/ desc); -public static final int pango_font_description_get_style(long /*int*/ desc) { +public static final native int _pango_font_description_get_style(long desc); +public static final int pango_font_description_get_style(long desc) { lock.lock(); try { return _pango_font_description_get_style(desc); @@ -3423,8 +3423,8 @@ public static final int pango_font_description_get_style(long /*int*/ desc) { } } /** @param desc cast=(PangoFontDescription *) */ -public static final native int _pango_font_description_get_weight(long /*int*/ desc); -public static final int pango_font_description_get_weight(long /*int*/ desc) { +public static final native int _pango_font_description_get_weight(long desc); +public static final int pango_font_description_get_weight(long desc) { lock.lock(); try { return _pango_font_description_get_weight(desc); @@ -3432,8 +3432,8 @@ public static final int pango_font_description_get_weight(long /*int*/ desc) { lock.unlock(); } } -public static final native long /*int*/ _pango_font_description_new(); -public static final long /*int*/ pango_font_description_new() { +public static final native long _pango_font_description_new(); +public static final long pango_font_description_new() { lock.lock(); try { return _pango_font_description_new(); @@ -3445,8 +3445,8 @@ public static final long /*int*/ pango_font_description_new() { * @param desc cast=(PangoFontDescription *) * @param family cast=(const char *),flags=no_out critical */ -public static final native void _pango_font_description_set_family(long /*int*/ desc, byte[] family); -public static final void pango_font_description_set_family(long /*int*/ desc, byte[] family) { +public static final native void _pango_font_description_set_family(long desc, byte[] family); +public static final void pango_font_description_set_family(long desc, byte[] family) { lock.lock(); try { _pango_font_description_set_family(desc, family); @@ -3458,8 +3458,8 @@ public static final void pango_font_description_set_family(long /*int*/ desc, by * @param desc cast=(PangoFontDescription *) * @param size cast=(gint) */ -public static final native void _pango_font_description_set_size(long /*int*/ desc, int size); -public static final void pango_font_description_set_size(long /*int*/ desc, int size) { +public static final native void _pango_font_description_set_size(long desc, int size); +public static final void pango_font_description_set_size(long desc, int size) { lock.lock(); try { _pango_font_description_set_size(desc, size); @@ -3471,8 +3471,8 @@ public static final void pango_font_description_set_size(long /*int*/ desc, int * @param desc cast=(PangoFontDescription *) * @param stretch cast=(PangoStretch) */ -public static final native void _pango_font_description_set_stretch(long /*int*/ desc, int stretch); -public static final void pango_font_description_set_stretch(long /*int*/ desc, int stretch) { +public static final native void _pango_font_description_set_stretch(long desc, int stretch); +public static final void pango_font_description_set_stretch(long desc, int stretch) { lock.lock(); try { _pango_font_description_set_stretch(desc, stretch); @@ -3484,8 +3484,8 @@ public static final void pango_font_description_set_stretch(long /*int*/ desc, i * @param desc cast=(PangoFontDescription *) * @param weight cast=(PangoStyle) */ -public static final native void _pango_font_description_set_style(long /*int*/ desc, int weight); -public static final void pango_font_description_set_style(long /*int*/ desc, int weight) { +public static final native void _pango_font_description_set_style(long desc, int weight); +public static final void pango_font_description_set_style(long desc, int weight) { lock.lock(); try { _pango_font_description_set_style(desc, weight); @@ -3497,8 +3497,8 @@ public static final void pango_font_description_set_style(long /*int*/ desc, int * @param desc cast=(PangoFontDescription *) * @param weight cast=(PangoWeight) */ -public static final native void _pango_font_description_set_weight(long /*int*/ desc, int weight); -public static final void pango_font_description_set_weight(long /*int*/ desc, int weight) { +public static final native void _pango_font_description_set_weight(long desc, int weight); +public static final void pango_font_description_set_weight(long desc, int weight) { lock.lock(); try { _pango_font_description_set_weight(desc, weight); @@ -3510,8 +3510,8 @@ public static final void pango_font_description_set_weight(long /*int*/ desc, in * @param desc cast=(PangoFontDescription *) * @param variant cast=(PangoVariant) */ -public static final native void _pango_font_description_set_variant(long /*int*/ desc, int variant); -public static final void pango_font_description_set_variant(long /*int*/ desc, int variant) { +public static final native void _pango_font_description_set_variant(long desc, int variant); +public static final void pango_font_description_set_variant(long desc, int variant) { lock.lock(); try { _pango_font_description_set_variant(desc, variant); @@ -3520,8 +3520,8 @@ public static final void pango_font_description_set_variant(long /*int*/ desc, i } } /** @param desc cast=(PangoFontDescription *) */ -public static final native long /*int*/ _pango_font_description_to_string(long /*int*/ desc); -public static final long /*int*/ pango_font_description_to_string(long /*int*/ desc) { +public static final native long _pango_font_description_to_string(long desc); +public static final long pango_font_description_to_string(long desc) { lock.lock(); try { return _pango_font_description_to_string(desc); @@ -3530,8 +3530,8 @@ public static final long /*int*/ pango_font_description_to_string(long /*int*/ d } } /** @param face cast=(PangoFontFace *) */ -public static final native long /*int*/ _pango_font_face_describe(long /*int*/ face); -public static final long /*int*/ pango_font_face_describe(long /*int*/ face) { +public static final native long _pango_font_face_describe(long face); +public static final long pango_font_face_describe(long face) { lock.lock(); try { return _pango_font_face_describe(face); @@ -3540,8 +3540,8 @@ public static final long /*int*/ pango_font_face_describe(long /*int*/ face) { } } /** @param family cast=(PangoFontFamily *) */ -public static final native long /*int*/ _pango_font_family_get_name(long /*int*/ family); -public static final long /*int*/ pango_font_family_get_name(long /*int*/ family) { +public static final native long _pango_font_family_get_name(long family); +public static final long pango_font_family_get_name(long family) { lock.lock(); try { return _pango_font_family_get_name(family); @@ -3554,8 +3554,8 @@ public static final long /*int*/ pango_font_family_get_name(long /*int*/ family) * @param faces cast=(PangoFontFace ***) * @param n_faces cast=(int *) */ -public static final native void _pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces); -public static final void pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces) { +public static final native void _pango_font_family_list_faces(long family, long /*int*/[] faces, int[] n_faces); +public static final void pango_font_family_list_faces(long family, long /*int*/[] faces, int[] n_faces) { lock.lock(); try { _pango_font_family_list_faces(family, faces, n_faces); @@ -3567,8 +3567,8 @@ public static final void pango_font_family_list_faces(long /*int*/ family, long * @param font cast=(PangoFont *) * @param language cast=(PangoLanguage *) */ -public static final native long /*int*/ _pango_font_get_metrics(long /*int*/ font, long /*int*/ language); -public static final long /*int*/ pango_font_get_metrics(long /*int*/ font, long /*int*/ language) { +public static final native long _pango_font_get_metrics(long font, long language); +public static final long pango_font_get_metrics(long font, long language) { lock.lock(); try { return _pango_font_get_metrics(font, language); @@ -3579,8 +3579,8 @@ public static final long /*int*/ pango_font_get_metrics(long /*int*/ font, long /** * @param fontMap cast=(PangoFontMap *) */ -public static final native long /*int*/ _pango_font_map_create_context(long /*int*/ fontMap); -public static final long /*int*/ pango_font_map_create_context(long /*int*/ fontMap) { +public static final native long _pango_font_map_create_context(long fontMap); +public static final long pango_font_map_create_context(long fontMap) { lock.lock(); try { return _pango_font_map_create_context(fontMap); @@ -3589,8 +3589,8 @@ public static final long /*int*/ pango_font_map_create_context(long /*int*/ font } } /** @param metrics cast=(PangoFontMetrics *) */ -public static final native int _pango_font_metrics_get_approximate_char_width(long /*int*/ metrics); -public static final int pango_font_metrics_get_approximate_char_width(long /*int*/ metrics) { +public static final native int _pango_font_metrics_get_approximate_char_width(long metrics); +public static final int pango_font_metrics_get_approximate_char_width(long metrics) { lock.lock(); try { return _pango_font_metrics_get_approximate_char_width(metrics); @@ -3599,8 +3599,8 @@ public static final int pango_font_metrics_get_approximate_char_width(long /*int } } /** @param metrics cast=(PangoFontMetrics *) */ -public static final native int _pango_font_metrics_get_ascent(long /*int*/ metrics); -public static final int pango_font_metrics_get_ascent(long /*int*/ metrics) { +public static final native int _pango_font_metrics_get_ascent(long metrics); +public static final int pango_font_metrics_get_ascent(long metrics) { lock.lock(); try { return _pango_font_metrics_get_ascent(metrics); @@ -3609,8 +3609,8 @@ public static final int pango_font_metrics_get_ascent(long /*int*/ metrics) { } } /** @param metrics cast=(PangoFontMetrics *) */ -public static final native int _pango_font_metrics_get_descent(long /*int*/ metrics); -public static final int pango_font_metrics_get_descent(long /*int*/ metrics) { +public static final native int _pango_font_metrics_get_descent(long metrics); +public static final int pango_font_metrics_get_descent(long metrics) { lock.lock(); try { return _pango_font_metrics_get_descent(metrics); @@ -3619,8 +3619,8 @@ public static final int pango_font_metrics_get_descent(long /*int*/ metrics) { } } /** @param metrics cast=(PangoFontMetrics *) */ -public static final native void _pango_font_metrics_unref(long /*int*/ metrics); -public static final void pango_font_metrics_unref(long /*int*/ metrics) { +public static final native void _pango_font_metrics_unref(long metrics); +public static final void pango_font_metrics_unref(long metrics) { lock.lock(); try { _pango_font_metrics_unref(metrics); @@ -3629,8 +3629,8 @@ public static final void pango_font_metrics_unref(long /*int*/ metrics) { } } /** @param layout cast=(PangoLayout *) */ -public static final native void _pango_layout_context_changed(long /*int*/ layout); -public static final void pango_layout_context_changed(long /*int*/ layout) { +public static final native void _pango_layout_context_changed(long layout); +public static final void pango_layout_context_changed(long layout) { lock.lock(); try { _pango_layout_context_changed(layout); @@ -3639,8 +3639,8 @@ public static final void pango_layout_context_changed(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout*) */ -public static final native int _pango_layout_get_alignment(long /*int*/ layout); -public static final int pango_layout_get_alignment(long /*int*/ layout) { +public static final native int _pango_layout_get_alignment(long layout); +public static final int pango_layout_get_alignment(long layout) { lock.lock(); try { return _pango_layout_get_alignment(layout); @@ -3649,8 +3649,8 @@ public static final int pango_layout_get_alignment(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout *) */ -public static final native long /*int*/ _pango_layout_get_context(long /*int*/ layout); -public static final long /*int*/ pango_layout_get_context(long /*int*/ layout) { +public static final native long _pango_layout_get_context(long layout); +public static final long pango_layout_get_context(long layout) { lock.lock(); try { return _pango_layout_get_context(layout); @@ -3659,8 +3659,8 @@ public static final long /*int*/ pango_layout_get_context(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout*) */ -public static final native int _pango_layout_get_indent(long /*int*/ layout); -public static final int pango_layout_get_indent(long /*int*/ layout) { +public static final native int _pango_layout_get_indent(long layout); +public static final int pango_layout_get_indent(long layout) { lock.lock(); try { return _pango_layout_get_indent(layout); @@ -3669,8 +3669,8 @@ public static final int pango_layout_get_indent(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout*) */ -public static final native long /*int*/ _pango_layout_get_iter(long /*int*/ layout); -public static final long /*int*/ pango_layout_get_iter(long /*int*/ layout) { +public static final native long _pango_layout_get_iter(long layout); +public static final long pango_layout_get_iter(long layout) { lock.lock(); try { return _pango_layout_get_iter(layout); @@ -3679,8 +3679,8 @@ public static final long /*int*/ pango_layout_get_iter(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout*) */ -public static final native boolean _pango_layout_get_justify(long /*int*/ layout); -public static final boolean pango_layout_get_justify(long /*int*/ layout) { +public static final native boolean _pango_layout_get_justify(long layout); +public static final boolean pango_layout_get_justify(long layout) { lock.lock(); try { return _pango_layout_get_justify(layout); @@ -3689,8 +3689,8 @@ public static final boolean pango_layout_get_justify(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout *) */ -public static final native long /*int*/ _pango_layout_get_line(long /*int*/ layout, int line); -public static final long /*int*/ pango_layout_get_line(long /*int*/ layout, int line) { +public static final native long _pango_layout_get_line(long layout, int line); +public static final long pango_layout_get_line(long layout, int line) { lock.lock(); try { return _pango_layout_get_line(layout, line); @@ -3699,8 +3699,8 @@ public static final long /*int*/ pango_layout_get_line(long /*int*/ layout, int } } /** @param layout cast=(PangoLayout*) */ -public static final native int _pango_layout_get_line_count(long /*int*/ layout); -public static final int pango_layout_get_line_count(long /*int*/ layout) { +public static final native int _pango_layout_get_line_count(long layout); +public static final int pango_layout_get_line_count(long layout) { lock.lock(); try { return _pango_layout_get_line_count(layout); @@ -3713,8 +3713,8 @@ public static final int pango_layout_get_line_count(long /*int*/ layout) { * @param attrs cast=(PangoLogAttr **) * @param n_attrs cast=(int *) */ -public static final native void _pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs); -public static final void pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs) { +public static final native void _pango_layout_get_log_attrs(long layout, long /*int*/[] attrs, int[] n_attrs); +public static final void pango_layout_get_log_attrs(long layout, long /*int*/[] attrs, int[] n_attrs) { lock.lock(); try { _pango_layout_get_log_attrs(layout, attrs, n_attrs); @@ -3727,8 +3727,8 @@ public static final void pango_layout_get_log_attrs(long /*int*/ layout, long /* * @param width cast=(int *) * @param height cast=(int *) */ -public static final native void _pango_layout_get_size(long /*int*/ layout, int[] width, int[] height); -public static final void pango_layout_get_size(long /*int*/ layout, int[] width, int[] height) { +public static final native void _pango_layout_get_size(long layout, int[] width, int[] height); +public static final void pango_layout_get_size(long layout, int[] width, int[] height) { lock.lock(); try { _pango_layout_get_size(layout, width, height); @@ -3741,8 +3741,8 @@ public static final void pango_layout_get_size(long /*int*/ layout, int[] width, * @param width cast=(int *) * @param height cast=(int *) */ -public static final native void _pango_layout_get_pixel_size(long /*int*/ layout, int[] width, int[] height); -public static final void pango_layout_get_pixel_size(long /*int*/ layout, int[] width, int[] height) { +public static final native void _pango_layout_get_pixel_size(long layout, int[] width, int[] height); +public static final void pango_layout_get_pixel_size(long layout, int[] width, int[] height) { lock.lock(); try { _pango_layout_get_pixel_size(layout, width, height); @@ -3751,8 +3751,8 @@ public static final void pango_layout_get_pixel_size(long /*int*/ layout, int[] } } /** @param layout cast=(PangoLayout*) */ -public static final native int _pango_layout_get_spacing(long /*int*/ layout); -public static final int pango_layout_get_spacing(long /*int*/ layout) { +public static final native int _pango_layout_get_spacing(long layout); +public static final int pango_layout_get_spacing(long layout) { lock.lock(); try { return _pango_layout_get_spacing(layout); @@ -3761,8 +3761,8 @@ public static final int pango_layout_get_spacing(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout *) */ -public static final native long /*int*/ _pango_layout_get_text(long /*int*/ layout); -public static final long /*int*/ pango_layout_get_text(long /*int*/ layout) { +public static final native long _pango_layout_get_text(long layout); +public static final long pango_layout_get_text(long layout) { lock.lock(); try { return _pango_layout_get_text(layout); @@ -3771,8 +3771,8 @@ public static final long /*int*/ pango_layout_get_text(long /*int*/ layout) { } } /** @param layout cast=(PangoLayout *) */ -public static final native int _pango_layout_get_width(long /*int*/ layout); -public static final int pango_layout_get_width(long /*int*/ layout) { +public static final native int _pango_layout_get_width(long layout); +public static final int pango_layout_get_width(long layout) { lock.lock(); try { return _pango_layout_get_width(layout); @@ -3784,8 +3784,8 @@ public static final int pango_layout_get_width(long /*int*/ layout) { * @param layout cast=(PangoLayout*) * @param pos flags=no_in */ -public static final native void _pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos); -public static final void pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos) { +public static final native void _pango_layout_index_to_pos(long layout, int index, PangoRectangle pos); +public static final void pango_layout_index_to_pos(long layout, int index, PangoRectangle pos) { lock.lock(); try { _pango_layout_index_to_pos(layout, index, pos); @@ -3794,8 +3794,8 @@ public static final void pango_layout_index_to_pos(long /*int*/ layout, int inde } } /** @param iter cast=(PangoLayoutIter*) */ -public static final native void _pango_layout_iter_free(long /*int*/ iter); -public static final void pango_layout_iter_free(long /*int*/ iter) { +public static final native void _pango_layout_iter_free(long iter); +public static final void pango_layout_iter_free(long iter) { lock.lock(); try { _pango_layout_iter_free(iter); @@ -3808,8 +3808,8 @@ public static final void pango_layout_iter_free(long /*int*/ iter) { * @param ink_rect flags=no_in * @param logical_rect flags=no_in */ -public static final native void _pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect); -public static final void pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) { +public static final native void _pango_layout_iter_get_line_extents(long iter, PangoRectangle ink_rect, PangoRectangle logical_rect); +public static final void pango_layout_iter_get_line_extents(long iter, PangoRectangle ink_rect, PangoRectangle logical_rect) { lock.lock(); try { _pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect); @@ -3818,8 +3818,8 @@ public static final void pango_layout_iter_get_line_extents(long /*int*/ iter, P } } /** @param iter cast=(PangoLayoutIter*) */ -public static final native int _pango_layout_iter_get_index(long /*int*/ iter); -public static final int pango_layout_iter_get_index(long /*int*/ iter) { +public static final native int _pango_layout_iter_get_index(long iter); +public static final int pango_layout_iter_get_index(long iter) { lock.lock(); try { return _pango_layout_iter_get_index(iter); @@ -3828,8 +3828,8 @@ public static final int pango_layout_iter_get_index(long /*int*/ iter) { } } /** @param iter cast=(PangoLayoutIter*) */ -public static final native long /*int*/ _pango_layout_iter_get_run(long /*int*/ iter); -public static final long /*int*/ pango_layout_iter_get_run(long /*int*/ iter) { +public static final native long _pango_layout_iter_get_run(long iter); +public static final long pango_layout_iter_get_run(long iter) { lock.lock(); try { return _pango_layout_iter_get_run(iter); @@ -3838,8 +3838,8 @@ public static final long /*int*/ pango_layout_iter_get_run(long /*int*/ iter) { } } /** @param iter cast=(PangoLayoutIter*) */ -public static final native boolean _pango_layout_iter_next_line(long /*int*/ iter); -public static final boolean pango_layout_iter_next_line(long /*int*/ iter) { +public static final native boolean _pango_layout_iter_next_line(long iter); +public static final boolean pango_layout_iter_next_line(long iter) { lock.lock(); try { return _pango_layout_iter_next_line(iter); @@ -3848,8 +3848,8 @@ public static final boolean pango_layout_iter_next_line(long /*int*/ iter) { } } /** @param iter cast=(PangoLayoutIter*) */ -public static final native boolean _pango_layout_iter_next_run(long /*int*/ iter); -public static final boolean pango_layout_iter_next_run(long /*int*/ iter) { +public static final native boolean _pango_layout_iter_next_run(long iter); +public static final boolean pango_layout_iter_next_run(long iter) { lock.lock(); try { return _pango_layout_iter_next_run(iter); @@ -3862,8 +3862,8 @@ public static final boolean pango_layout_iter_next_run(long /*int*/ iter) { * @param ink_rect cast=(PangoRectangle *),flags=no_in * @param logical_rect cast=(PangoRectangle *),flags=no_in */ -public static final native void _pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect); -public static final void pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) { +public static final native void _pango_layout_line_get_extents(long line, PangoRectangle ink_rect, PangoRectangle logical_rect); +public static final void pango_layout_line_get_extents(long line, PangoRectangle ink_rect, PangoRectangle logical_rect) { lock.lock(); try { _pango_layout_line_get_extents(line, ink_rect, logical_rect); @@ -3872,8 +3872,8 @@ public static final void pango_layout_line_get_extents(long /*int*/ line, PangoR } } /** @param context cast=(PangoContext *) */ -public static final native long /*int*/ _pango_layout_new(long /*int*/ context); -public static final long /*int*/ pango_layout_new(long /*int*/ context) { +public static final native long _pango_layout_new(long context); +public static final long pango_layout_new(long context) { lock.lock(); try { return _pango_layout_new(context); @@ -3882,8 +3882,8 @@ public static final long /*int*/ pango_layout_new(long /*int*/ context) { } } /** @param layout cast=(PangoLayout *) */ -public static final native void _pango_layout_set_alignment (long /*int*/ layout, int alignment); -public static final void pango_layout_set_alignment (long /*int*/ layout, int alignment) { +public static final native void _pango_layout_set_alignment (long layout, int alignment); +public static final void pango_layout_set_alignment (long layout, int alignment) { lock.lock(); try { _pango_layout_set_alignment(layout, alignment); @@ -3895,8 +3895,8 @@ public static final void pango_layout_set_alignment (long /*int*/ layout, int al * @param layout cast=(PangoLayout *) * @param attrs cast=(PangoAttrList *) */ -public static final native void _pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs); -public static final void pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs) { +public static final native void _pango_layout_set_attributes(long layout, long attrs); +public static final void pango_layout_set_attributes(long layout, long attrs) { lock.lock(); try { _pango_layout_set_attributes(layout, attrs); @@ -3907,8 +3907,8 @@ public static final void pango_layout_set_attributes(long /*int*/ layout, long / /** * @param layout cast=(PangoLayout *) */ -public static final native void _pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir); -public static final void pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir) { +public static final native void _pango_layout_set_auto_dir(long layout, boolean auto_dir); +public static final void pango_layout_set_auto_dir(long layout, boolean auto_dir) { lock.lock(); try { _pango_layout_set_auto_dir(layout, auto_dir); @@ -3920,8 +3920,8 @@ public static final void pango_layout_set_auto_dir(long /*int*/ layout, boolean * @param context cast=(PangoLayout *) * @param descr cast=(PangoFontDescription *) */ -public static final native void _pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr); -public static final void pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr) { +public static final native void _pango_layout_set_font_description(long context, long descr); +public static final void pango_layout_set_font_description(long context, long descr) { lock.lock(); try { _pango_layout_set_font_description(context, descr); @@ -3930,8 +3930,8 @@ public static final void pango_layout_set_font_description(long /*int*/ context, } } /** @param layout cast=(PangoLayout*) */ -public static final native void _pango_layout_set_indent(long /*int*/ layout, int indent); -public static final void pango_layout_set_indent(long /*int*/ layout, int indent) { +public static final native void _pango_layout_set_indent(long layout, int indent); +public static final void pango_layout_set_indent(long layout, int indent) { lock.lock(); try { _pango_layout_set_indent(layout, indent); @@ -3940,8 +3940,8 @@ public static final void pango_layout_set_indent(long /*int*/ layout, int indent } } /** @param layout cast=(PangoLayout*) */ -public static final native void _pango_layout_set_justify(long /*int*/ layout, boolean justify); -public static final void pango_layout_set_justify(long /*int*/ layout, boolean justify) { +public static final native void _pango_layout_set_justify(long layout, boolean justify); +public static final void pango_layout_set_justify(long layout, boolean justify) { lock.lock(); try { _pango_layout_set_justify(layout, justify); @@ -3953,8 +3953,8 @@ public static final void pango_layout_set_justify(long /*int*/ layout, boolean j * @param context cast=(PangoLayout *) * @param setting cast=(gboolean) */ -public static final native void _pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting); -public static final void pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting) { +public static final native void _pango_layout_set_single_paragraph_mode(long context, boolean setting); +public static final void pango_layout_set_single_paragraph_mode(long context, boolean setting) { lock.lock(); try { _pango_layout_set_single_paragraph_mode(context, setting); @@ -3963,8 +3963,8 @@ public static final void pango_layout_set_single_paragraph_mode(long /*int*/ con } } /** @param layout cast=(PangoLayout *) */ -public static final native void _pango_layout_set_spacing(long /*int*/ layout, int spacing); -public static final void pango_layout_set_spacing(long /*int*/ layout, int spacing) { +public static final native void _pango_layout_set_spacing(long layout, int spacing); +public static final void pango_layout_set_spacing(long layout, int spacing) { lock.lock(); try { _pango_layout_set_spacing(layout, spacing); @@ -3976,8 +3976,8 @@ public static final void pango_layout_set_spacing(long /*int*/ layout, int spaci * @param layout cast=(PangoLayout *) * @param tabs cast=(PangoTabArray *) */ -public static final native void _pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs); -public static final void pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs) { +public static final native void _pango_layout_set_tabs(long layout, long tabs); +public static final void pango_layout_set_tabs(long layout, long tabs) { lock.lock(); try { _pango_layout_set_tabs(layout, tabs); @@ -3990,8 +3990,8 @@ public static final void pango_layout_set_tabs(long /*int*/ layout, long /*int*/ * @param text cast=(const char *),flags=no_out critical * @param length cast=(int) */ -public static final native void _pango_layout_set_text(long /*int*/ layout, byte[] text, int length); -public static final void pango_layout_set_text(long /*int*/ layout, byte[] text, int length) { +public static final native void _pango_layout_set_text(long layout, byte[] text, int length); +public static final void pango_layout_set_text(long layout, byte[] text, int length) { lock.lock(); try { _pango_layout_set_text(layout, text, length); @@ -4000,8 +4000,8 @@ public static final void pango_layout_set_text(long /*int*/ layout, byte[] text, } } /** @param layout cast=(PangoLayout *) */ -public static final native void _pango_layout_set_width(long /*int*/ layout, int width); -public static final void pango_layout_set_width(long /*int*/ layout, int width) { +public static final native void _pango_layout_set_width(long layout, int width); +public static final void pango_layout_set_width(long layout, int width) { lock.lock(); try { _pango_layout_set_width(layout, width); @@ -4010,8 +4010,8 @@ public static final void pango_layout_set_width(long /*int*/ layout, int width) } } /** @param layout cast=(PangoLayout *) */ -public static final native void _pango_layout_set_wrap (long /*int*/ layout, int wrap); -public static final void pango_layout_set_wrap (long /*int*/ layout, int wrap) { +public static final native void _pango_layout_set_wrap (long layout, int wrap); +public static final void pango_layout_set_wrap (long layout, int wrap) { lock.lock(); try { _pango_layout_set_wrap(layout, wrap); @@ -4024,8 +4024,8 @@ public static final void pango_layout_set_wrap (long /*int*/ layout, int wrap) { * @param index cast=(int *) * @param trailing cast=(int *) */ -public static final native boolean _pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing); -public static final boolean pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing) { +public static final native boolean _pango_layout_xy_to_index(long layout, int x, int y, int[] index, int[] trailing); +public static final boolean pango_layout_xy_to_index(long layout, int x, int y, int[] index, int[] trailing) { lock.lock(); try { return _pango_layout_xy_to_index(layout, x, y, index, trailing); @@ -4034,8 +4034,8 @@ public static final boolean pango_layout_xy_to_index(long /*int*/ layout, int x, } } /** @param tab_array cast=(PangoTabArray *) */ -public static final native void _pango_tab_array_free(long /*int*/ tab_array); -public static final void pango_tab_array_free(long /*int*/ tab_array) { +public static final native void _pango_tab_array_free(long tab_array); +public static final void pango_tab_array_free(long tab_array) { lock.lock(); try { _pango_tab_array_free(tab_array); @@ -4047,8 +4047,8 @@ public static final void pango_tab_array_free(long /*int*/ tab_array) { * @param initial_size cast=(gint) * @param positions_in_pixels cast=(gboolean) */ -public static final native long /*int*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels); -public static final long /*int*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) { +public static final native long _pango_tab_array_new(int initial_size, boolean positions_in_pixels); +public static final long pango_tab_array_new(int initial_size, boolean positions_in_pixels) { lock.lock(); try { return _pango_tab_array_new(initial_size, positions_in_pixels); @@ -4062,8 +4062,8 @@ public static final long /*int*/ pango_tab_array_new(int initial_size, boolean p * @param alignment cast=(PangoTabAlign) * @param location cast=(gint) */ -public static final native void _pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location); -public static final void pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location) { +public static final native void _pango_tab_array_set_tab(long tab_array, int tab_index, long alignment, int location); +public static final void pango_tab_array_set_tab(long tab_array, int tab_index, long alignment, int location) { lock.lock(); try { _pango_tab_array_set_tab(tab_array, tab_index, alignment, location); @@ -4075,7 +4075,7 @@ public static final void pango_tab_array_set_tab(long /*int*/ tab_array, int tab * @method flags=dynamic */ public static final native long /*int*/_ubuntu_menu_proxy_get(); -public static final long /*int*/ ubuntu_menu_proxy_get() { +public static final long ubuntu_menu_proxy_get() { lock.lock(); try { return _ubuntu_menu_proxy_get(); @@ -4099,7 +4099,7 @@ public static final int access (byte [] path, int amode) { * @param s1 cast=(const char*) * @param s2 cast=(const char*) */ -public static final native int strcmp (long /*int*/ s1, byte [] s2); +public static final native int strcmp (long s1, byte [] s2); /** * Theme name as given by OS. @@ -4123,8 +4123,8 @@ public static final String getThemeName() { public static final byte [] getThemeNameBytes() { byte [] buffer = null; int length; - long /*int*/ settings = GTK.gtk_settings_get_default (); - long /*int*/ [] ptr = new long /*int*/ [1]; + long settings = GTK.gtk_settings_get_default (); + long [] ptr = new long [1]; OS.g_object_get (settings, GTK.gtk_theme_name, ptr, 0); if (ptr [0] == 0) { return buffer; @@ -4162,10 +4162,10 @@ public static final byte [] getThemeNameBytes() { * @param error cast=(GError **) * @category gdbus */ -public static final native long /*int*/ _g_dbus_proxy_new_for_bus_sync (int bus_type, int flags, long /*int*/ info, byte [] name, byte [] object_path, byte [] interface_name, - long /*int*/ cancellable, long /*int*/[] error); -public static final long /*int*/ g_dbus_proxy_new_for_bus_sync (int bus_type, int flags, long /*int*/ info, byte [] name, byte [] object_path, byte [] interface_name, - long /*int*/ cancellable, long /*int*/[] error) { +public static final native long _g_dbus_proxy_new_for_bus_sync (int bus_type, int flags, long info, byte [] name, byte [] object_path, byte [] interface_name, + long cancellable, long /*int*/[] error); +public static final long g_dbus_proxy_new_for_bus_sync (int bus_type, int flags, long info, byte [] name, byte [] object_path, byte [] interface_name, + long cancellable, long /*int*/[] error) { lock.lock(); try { return _g_dbus_proxy_new_for_bus_sync (bus_type, flags, info, name, object_path, interface_name, cancellable, error); @@ -4182,8 +4182,8 @@ public static final long /*int*/ g_dbus_proxy_new_for_bus_sync (int bus_type, in * @param error cast=(GError **) * @category gdbus */ -public static final native long /*int*/ _g_dbus_proxy_call_sync (long /*int*/ proxy, byte[] method_name, long /*int*/ parameters, int flags, int timeout_msec, long /*int*/ cancellable, long /*int*/[] error); -public static final long /*int*/ g_dbus_proxy_call_sync (long /*int*/ proxy, byte[] method_name, long /*int*/ parameters, int flags, int timeout_msec, long /*int*/ cancellable, long /*int*/[] error) { +public static final native long _g_dbus_proxy_call_sync (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long /*int*/[] error); +public static final long g_dbus_proxy_call_sync (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long /*int*/[] error) { lock.lock(); try { return _g_dbus_proxy_call_sync (proxy, method_name, parameters, flags, timeout_msec, cancellable, error); @@ -4201,8 +4201,8 @@ public static final long /*int*/ g_dbus_proxy_call_sync (long /*int*/ proxy, byt * @param error cast=(GError **) * @category gdbus */ -public static final native void _g_dbus_proxy_call (long /*int*/ proxy, byte[] method_name, long /*int*/ parameters, int flags, int timeout_msec, long /*int*/ cancellable, long /*int*/ callback, long /*int*/[] error); -public static final void g_dbus_proxy_call (long /*int*/ proxy, byte[] method_name, long /*int*/ parameters, int flags, int timeout_msec, long /*int*/ cancellable, long /*int*/ callback, long /*int*/[] error) { +public static final native void _g_dbus_proxy_call (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long callback, long /*int*/[] error); +public static final void g_dbus_proxy_call (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long callback, long /*int*/[] error) { lock.lock(); try { _g_dbus_proxy_call (proxy, method_name, parameters, flags, timeout_msec, cancellable, callback, error); @@ -4217,8 +4217,8 @@ public static final void g_dbus_proxy_call (long /*int*/ proxy, byte[] method_na * @param error cast=(GError **) * @category gdbus */ -public static final native long /*int*/ _g_dbus_proxy_call_finish (long /*int*/ proxy, long /*int*/ res, long /*int*/[] error); -public static final long /*int*/ g_dbus_proxy_call_finish (long /*int*/ proxy, long /*int*/ res, long /*int*/[] error) { +public static final native long _g_dbus_proxy_call_finish (long proxy, long res, long /*int*/[] error); +public static final long g_dbus_proxy_call_finish (long proxy, long res, long /*int*/[] error) { lock.lock(); try { return _g_dbus_proxy_call_finish (proxy, res, error); @@ -4232,9 +4232,9 @@ public static final long /*int*/ g_dbus_proxy_call_finish (long /*int*/ proxy, l * @param error cast=(GError **) * @category gdbus */ -public static final native long /*int*/ _g_dbus_node_info_new_for_xml (byte[] xml_data, long /*int*/[] error); +public static final native long _g_dbus_node_info_new_for_xml (byte[] xml_data, long /*int*/[] error); /** @category gdbus */ -public static final long /*int*/ g_dbus_node_info_new_for_xml (byte[] xml_data, long /*int*/[] error) { +public static final long g_dbus_node_info_new_for_xml (byte[] xml_data, long /*int*/[] error) { lock.lock(); try { return _g_dbus_node_info_new_for_xml (xml_data, error); @@ -4254,9 +4254,9 @@ public static final long /*int*/ g_dbus_node_info_new_for_xml (byte[] xml_data, * @param user_data_free_func cast=(GDestroyNotify) * @category gdbus */ -public static final native int _g_bus_own_name (int bus_type, byte[] name, int flags, long /*int*/ bus_acquired_handler, long /*int*/ name_acquired_handler, long /*int*/ name_lost_handler, long /*int*/ user_data, long /*int*/ user_data_free_func); +public static final native int _g_bus_own_name (int bus_type, byte[] name, int flags, long bus_acquired_handler, long name_acquired_handler, long name_lost_handler, long user_data, long user_data_free_func); /** @category gdbus */ -public static final int g_bus_own_name (int bus_type, byte[] name, int flags, long /*int*/ bus_acquired_handler, long /*int*/ name_acquired_handler, long /*int*/ name_lost_handler, long /*int*/ user_data, long /*int*/ user_data_free_func) { +public static final int g_bus_own_name (int bus_type, byte[] name, int flags, long bus_acquired_handler, long name_acquired_handler, long name_lost_handler, long user_data, long user_data_free_func) { lock.lock(); try { return _g_bus_own_name(bus_type, name, flags, bus_acquired_handler, name_acquired_handler, name_lost_handler, user_data, user_data_free_func); @@ -4275,9 +4275,9 @@ public static final int g_bus_own_name (int bus_type, byte[] name, int flags, lo * @param error cast=(GError **) * @category gdbus */ -public static final native int _g_dbus_connection_register_object (long /*int*/ connection, byte[] object_path, long /*int*/ interface_info, long /*int*/[] vtable, long /*int*/ user_data, long /*int*/ user_data_free_func, long /*int*/[] error); +public static final native int _g_dbus_connection_register_object (long connection, byte[] object_path, long interface_info, long /*int*/[] vtable, long user_data, long user_data_free_func, long /*int*/[] error); /** @category gdbus */ -public static final int g_dbus_connection_register_object (long /*int*/ connection, byte[] object_path, long /*int*/ interface_info, long /*int*/[] vtable, long /*int*/ user_data, long /*int*/ user_data_free_func, long /*int*/[] error) { +public static final int g_dbus_connection_register_object (long connection, byte[] object_path, long interface_info, long /*int*/[] vtable, long user_data, long user_data_free_func, long /*int*/[] error) { lock.lock(); try { return _g_dbus_connection_register_object( connection, object_path, interface_info, vtable, user_data, user_data_free_func, error); @@ -4291,9 +4291,9 @@ public static final int g_dbus_connection_register_object (long /*int*/ connecti * @param name cast=(const gchar *) * @category gdbus */ -public static final native long /*int*/ _g_dbus_node_info_lookup_interface (long /*int*/ info, byte [] name); +public static final native long _g_dbus_node_info_lookup_interface (long info, byte [] name); /** @category gdbus */ -public static final long /*int*/ g_dbus_node_info_lookup_interface (long /*int*/ info, byte [] name) { +public static final long g_dbus_node_info_lookup_interface (long info, byte [] name) { lock.lock(); try { return _g_dbus_node_info_lookup_interface(info, name); @@ -4307,9 +4307,9 @@ public static final long /*int*/ g_dbus_node_info_lookup_interface (long /*int*/ * @param parameters cast=(GVariant *) * @category gdbus */ -public static final native void _g_dbus_method_invocation_return_value (long /*int*/ invocation, long /*int*/ parameters); +public static final native void _g_dbus_method_invocation_return_value (long invocation, long parameters); /** @category gdbus */ -public static final void g_dbus_method_invocation_return_value (long /*int*/ invocation, long /*int*/ parameters) { +public static final void g_dbus_method_invocation_return_value (long invocation, long parameters) { lock.lock(); try { _g_dbus_method_invocation_return_value (invocation, parameters); @@ -4322,9 +4322,9 @@ public static final void g_dbus_method_invocation_return_value (long /*int*/ inv * @param type cast=(const GVariantType *) * @category gdbus */ -public static final native long /*int*/ _g_variant_builder_new (long /*int*/ type); +public static final native long _g_variant_builder_new (long type); /** @category gdbus */ -public static final long /*int*/ g_variant_builder_new (long /*int*/ type) { +public static final long g_variant_builder_new (long type) { lock.lock(); try { return _g_variant_builder_new(type); @@ -4338,9 +4338,9 @@ public static final long /*int*/ g_variant_builder_new (long /*int*/ type) { * @param value cast=(GVariant *) * @category gdbus */ -public static final native void /*int*/ _g_variant_builder_add_value (long /*int*/ builder, long /*int*/ value); +public static final native void _g_variant_builder_add_value (long builder, long value); /** @category gdbus */ -public static final void /*int*/ g_variant_builder_add_value (long /*int*/ builder, long /*int*/ value) { +public static final void g_variant_builder_add_value (long builder, long value) { lock.lock(); try { _g_variant_builder_add_value(builder, value); @@ -4353,9 +4353,9 @@ public static final void /*int*/ g_variant_builder_add_value (long /*int*/ build * @param type cast=(const gchar *) * @category gdbus */ -public static final native long /*int*/ _g_variant_type_new (byte [] type); +public static final native long _g_variant_type_new (byte [] type); /** @category gdbus */ -public static final long /*int*/ g_variant_type_new (byte [] type) { +public static final long g_variant_type_new (byte [] type) { lock.lock(); try { return _g_variant_type_new(type); @@ -4368,9 +4368,9 @@ public static final long /*int*/ g_variant_type_new (byte [] type) { * @param builder cast=(GVariantBuilder *) * @category gdbus */ -public static final native long /*int*/ _g_variant_builder_end (long /*int*/ builder); +public static final native long _g_variant_builder_end (long builder); /** @category gdbus */ -public static final long /*int*/ g_variant_builder_end (long /*int*/ builder) { +public static final long g_variant_builder_end (long builder) { lock.lock(); try { return _g_variant_builder_end(builder); @@ -4383,9 +4383,9 @@ public static final long /*int*/ g_variant_builder_end (long /*int*/ builder) { * @param builder cast=(GVariantBuilder *) * @category gdbus */ -public static final native void /*int*/ _g_variant_builder_unref (long /*int*/ builder); +public static final native void _g_variant_builder_unref (long builder); /** @category gdbus */ -public static final void /*int*/ g_variant_builder_unref (long /*int*/ builder) { +public static final void g_variant_builder_unref (long builder) { lock.lock(); try { _g_variant_builder_unref(builder); @@ -4398,9 +4398,9 @@ public static final void /*int*/ g_variant_builder_unref (long /*int*/ builder) * @param intval cast=(gint32) * @category gdbus */ -public static final native long /*int*/ _g_variant_new_int32 (int intval); +public static final native long _g_variant_new_int32 (int intval); /** @category gdbus */ -public static final long /*int*/ g_variant_new_int32 (int intval) { +public static final long g_variant_new_int32 (int intval) { lock.lock(); try { return _g_variant_new_int32(intval); @@ -4415,9 +4415,9 @@ public static final long /*int*/ g_variant_new_int32 (int intval) { * @category gdbus * @return int */ -public static final native int _g_variant_get_int32 (long /*int*/ gvariant); +public static final native int _g_variant_get_int32 (long gvariant); /** @category gdbus */ -public static final int g_variant_get_int32 (long /*int*/ gvariant) { +public static final int g_variant_get_int32 (long gvariant) { lock.lock(); try { return _g_variant_get_int32 (gvariant); @@ -4431,9 +4431,9 @@ public static final int g_variant_get_int32 (long /*int*/ gvariant) { * @category gdbus * @return guchar */ -public static final native byte _g_variant_get_byte (long /*int*/ gvariant); +public static final native byte _g_variant_get_byte (long gvariant); /** @category gdbus */ -public static final byte g_variant_get_byte (long /*int*/ gvariant) { +public static final byte g_variant_get_byte (long gvariant) { lock.lock(); try { return _g_variant_get_byte (gvariant); @@ -4446,9 +4446,9 @@ public static final byte g_variant_get_byte (long /*int*/ gvariant) { * @param gvariant cast=(GVariant *) * @category gdbus */ -public static final native boolean /*int*/ _g_variant_get_boolean (long /*int*/ gvariant); +public static final native boolean _g_variant_get_boolean (long gvariant); /** @category gdbus */ -public static final boolean /*int*/ g_variant_get_boolean (long /*int*/ gvariant) { +public static final boolean g_variant_get_boolean (long gvariant) { lock.lock(); try { return _g_variant_get_boolean (gvariant); @@ -4462,9 +4462,9 @@ public static final boolean /*int*/ g_variant_get_boolean (long /*int*/ gvariant * @param index cast=(gsize) * @category gdbus */ -public static final native long /*int*/ _g_variant_get_child_value (long /*int*/ gvariant, int index); +public static final native long _g_variant_get_child_value (long gvariant, int index); /** @category gdbus */ -public static final long /*int*/ g_variant_get_child_value (long /*int*/ gvariant, int index) { +public static final long g_variant_get_child_value (long gvariant, int index) { lock.lock(); try { return _g_variant_get_child_value (gvariant, index); @@ -4477,9 +4477,9 @@ public static final long /*int*/ g_variant_get_child_value (long /*int*/ gvarian * @param gvariant cast=(GVariant *) * @category gdbus */ -public static final native double _g_variant_get_double (long /*int*/ gvariant); +public static final native double _g_variant_get_double (long gvariant); /** @category gdbus */ -public static final double g_variant_get_double (long /*int*/ gvariant) { +public static final double g_variant_get_double (long gvariant) { lock.lock(); try { return _g_variant_get_double (gvariant); @@ -4488,8 +4488,8 @@ public static final double g_variant_get_double (long /*int*/ gvariant) { } } -public static final native long /*int*/ _g_variant_new_uint64 (long value); -public static final long /*int*/ g_variant_new_uint64 (long value) { +public static final native long _g_variant_new_uint64 (long value); +public static final long g_variant_new_uint64 (long value) { lock.lock(); try { return _g_variant_new_uint64 (value); @@ -4502,9 +4502,9 @@ public static final long /*int*/ g_variant_new_uint64 (long value) { * @param gvariant cast=(GVariant *) * @category gdbus */ -public static final native long _g_variant_get_uint64 (long /*int*/ gvariant); +public static final native long _g_variant_get_uint64 (long gvariant); /** @category gdbus */ -public static final long g_variant_get_uint64 (long /*int*/ gvariant) { +public static final long g_variant_get_uint64 (long gvariant) { lock.lock(); try { return _g_variant_get_uint64 (gvariant); @@ -4518,9 +4518,9 @@ public static final long g_variant_get_uint64 (long /*int*/ gvariant) { * @param length cast=(gsize *) * @category gdbus */ -public static final native long /*int*/ _g_variant_get_string (long /*int*/ gvariant, long[] length); +public static final native long _g_variant_get_string (long gvariant, long[] length); /** @category gdbus */ -public static final long /*int*/ g_variant_get_string (long /*int*/ gvariant, long[] length) { +public static final long g_variant_get_string (long gvariant, long[] length) { lock.lock(); try { return _g_variant_get_string (gvariant, length); @@ -4534,9 +4534,9 @@ public static final long /*int*/ g_variant_get_string (long /*int*/ gvariant, lo * @return const GVariantType * * @category gdbus */ -public static final native long /*int*/ _g_variant_get_type (long /*int*/ gvariant); +public static final native long _g_variant_get_type (long gvariant); /** @category gdbus */ -public static final long /*int*/ g_variant_get_type (long /*int*/ gvariant) { +public static final long g_variant_get_type (long gvariant) { lock.lock(); try { return _g_variant_get_type (gvariant); @@ -4549,9 +4549,9 @@ public static final long /*int*/ g_variant_get_type (long /*int*/ gvariant) { * @param gvariant cast=(GVariant *) * @category gdbus */ -public static final native long /*int*/ _g_variant_get_type_string (long /*int*/ gvariant); +public static final native long _g_variant_get_type_string (long gvariant); /** @category gdbus */ -public static final long /*int*/ g_variant_get_type_string (long /*int*/ gvariant) { +public static final long g_variant_get_type_string (long gvariant) { lock.lock(); try { return _g_variant_get_type_string (gvariant); @@ -4565,9 +4565,9 @@ public static final long /*int*/ g_variant_get_type_string (long /*int*/ gvarian * @param type cast=(const GVariantType *) * @category gdbus */ -public static final native boolean _g_variant_is_of_type (long /*int*/ gvariant, byte[] type); +public static final native boolean _g_variant_is_of_type (long gvariant, byte[] type); /** @category gdbus */ -public static final boolean g_variant_is_of_type (long /*int*/ gvariant, byte[] type) { +public static final boolean g_variant_is_of_type (long gvariant, byte[] type) { lock.lock(); try { return _g_variant_is_of_type (gvariant, type); @@ -4595,9 +4595,9 @@ public static final long g_variant_n_children (long gvariant) { * @param value cast=(gboolean) * @category gdbus */ -public static final native long /*int*/ _g_variant_new_boolean (boolean value); +public static final native long _g_variant_new_boolean (boolean value); /** @category gdbus */ -public static final long /*int*/ g_variant_new_boolean (boolean value) { +public static final long g_variant_new_boolean (boolean value) { lock.lock(); try { return _g_variant_new_boolean (value); @@ -4610,9 +4610,9 @@ public static final long /*int*/ g_variant_new_boolean (boolean value) { * @param value cast=(gboolean) * @category gdbus */ -public static final native long /*int*/ _g_variant_new_double (double value); +public static final native long _g_variant_new_double (double value); /** @category gdbus */ -public static final long /*int*/ g_variant_new_double (double value) { +public static final long g_variant_new_double (double value) { lock.lock(); try { return _g_variant_new_double (value); @@ -4625,9 +4625,9 @@ public static final long /*int*/ g_variant_new_double (double value) { * @param value cast=(guchar) * @category gdbus */ -public static final native long /*int*/ _g_variant_new_byte (byte value); +public static final native long _g_variant_new_byte (byte value); /** @category gdbus */ -public static final long /*int*/ g_variant_new_byte (byte value) { +public static final long g_variant_new_byte (byte value) { lock.lock(); try { return _g_variant_new_byte (value); @@ -4641,9 +4641,9 @@ public static final long /*int*/ g_variant_new_byte (byte value) { * @param length cast=(gsize) * @category gdbus */ -public static final native long /*int*/ _g_variant_new_tuple (long /*int*/[] items, long length); +public static final native long _g_variant_new_tuple (long /*int*/[] items, long length); /** @category gdbus */ -public static final long /*int*/ g_variant_new_tuple (long /*int*/[] items, long length ) { +public static final long g_variant_new_tuple (long /*int*/[] items, long length ) { lock.lock(); try { return _g_variant_new_tuple (items, length); @@ -4656,9 +4656,9 @@ public static final long /*int*/ g_variant_new_tuple (long /*int*/[] items, long * @param string cast=(const gchar *) * @category gdbus */ -public static final native long /*int*/ _g_variant_new_string (byte[] string); +public static final native long _g_variant_new_string (byte[] string); /** @category gdbus */ -public static final long /*int*/ g_variant_new_string (byte[] string) { +public static final long g_variant_new_string (byte[] string) { lock.lock(); try { return _g_variant_new_string (string); @@ -4670,9 +4670,9 @@ public static final long /*int*/ g_variant_new_string (byte[] string) { /** * @param object cast=(GObject *) */ -public static final native long /*int*/ _g_object_ref_sink(long /*int*/ object); +public static final native long _g_object_ref_sink(long object); -public static final long /*int*/ g_object_ref_sink(long /*int*/ object) { +public static final long g_object_ref_sink(long object) { lock.lock(); try { return _g_object_ref_sink(object); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java index bb4e48817d..1e815b6d54 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk; public class PangoAttribute { /** @field cast=(const PangoAttrClass *) */ - public long /*int*/ klass; + public long klass; public int start_index; public int end_index; public static final int sizeof = OS.PangoAttribute_sizeof(); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java index 25a77ab3c7..7e51cdff01 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java @@ -19,16 +19,16 @@ public class PangoItem { public int length; public int num_chars; /** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */ - public long /*int*/ analysis_shape_engine; + public long analysis_shape_engine; /** @field accessor=analysis.lang_engine,cast=(PangoEngineLang *) */ - public long /*int*/ analysis_lang_engine; + public long analysis_lang_engine; /** @field accessor=analysis.font,cast=(PangoFont *) */ - public long /*int*/ analysis_font; + public long analysis_font; /** @field accessor=analysis.level */ public byte analysis_level; /** @field accessor=analysis.language,cast=(PangoLanguage *) */ - public long /*int*/ analysis_language; + public long analysis_language; /** @field accessor=analysis.extra_attrs,cast=(GSList *) */ - public long /*int*/ analysis_extra_attrs; + public long analysis_extra_attrs; public static final int sizeof = OS.PangoItem_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java index e21b08d9b0..0de11ed027 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java @@ -16,11 +16,11 @@ package org.eclipse.swt.internal.gtk; public class PangoLayoutLine { /** @field cast=(PangoLayout *) */ - public long /*int*/ layout; + public long layout; public int start_index; public int length; /** @field cast=(GSList *) */ - public long /*int*/ runs; + public long runs; // public boolean is_paragraph_start; // public byte resolved_dir; public static final int sizeof = OS.PangoLayoutLine_sizeof(); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java index a9838e86f6..aa0b8c6349 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java @@ -16,8 +16,8 @@ package org.eclipse.swt.internal.gtk; public class PangoLayoutRun { /** @field cast=(PangoItem *) */ - public long /*int*/ item; + public long item; /** @field cast=(PangoGlyphString *) */ - public long /*int*/ glyphs; + public long glyphs; public static final int sizeof = OS.PangoLayoutRun_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java index 411956bab4..d8f42af7fe 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java @@ -15,11 +15,11 @@ package org.eclipse.swt.internal.gtk; public abstract class XAnyEvent extends XEvent { - public long /*int*/ serial; + public long serial; public int send_event; /** @field cast=(Display *) */ - public long /*int*/ display; + public long display; /** @field cast=(Window) */ - public long /*int*/ window; + public long window; public static final int sizeof = OS.XAnyEvent_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java index 5a21fc7137..c42f9ca2df 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java @@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.*; public class PrintDialog extends Dialog { PrinterData printerData = new PrinterData(); - long /*int*/ handle; + long handle; int index; byte [] settingsData; @@ -293,7 +293,7 @@ public void setPrintToFile(boolean printToFile) { */ public PrinterData open() { byte [] titleBytes = Converter.wcsToMbcs (getText(), true); - long /*int*/ topHandle = getParent().handle; + long topHandle = getParent().handle; while (topHandle != 0 && !GTK.GTK_IS_WINDOW(topHandle)) { topHandle = GTK.gtk_widget_get_parent(topHandle); } @@ -306,8 +306,8 @@ public PrinterData open() { GTK.GTK_PRINT_CAPABILITY_COLLATE | GTK.GTK_PRINT_CAPABILITY_COPIES | GTK.GTK_PRINT_CAPABILITY_PAGE_SET); /* Set state into print dialog settings. */ - long /*int*/ settings = GTK.gtk_print_settings_new(); - long /*int*/ page_setup = GTK.gtk_page_setup_new(); + long settings = GTK.gtk_print_settings_new(); + long page_setup = GTK.gtk_page_setup_new(); if (printerData.otherData != null) { Printer.restore(printerData.otherData, settings, page_setup); @@ -317,7 +317,7 @@ public PrinterData open() { String printerName = printerData.name; if (printerName == null && printerData.printToFile) { /* Find the printer name corresponding to the file backend. */ - long /*int*/ printer = Printer.gtkPrinterFromPrinterData(printerData); + long printer = Printer.gtkPrinterFromPrinterData(printerData); if (printer != 0) { PrinterData data = Printer.printerDataFromGtkPrinter(printer); printerName = data.name; @@ -376,7 +376,7 @@ public PrinterData open() { GTK.gtk_print_unix_dialog_set_embed_page_setup(handle, true); OS.g_object_unref(settings); OS.g_object_unref(page_setup); - long /*int*/ group = GTK.gtk_window_get_group(0); + long group = GTK.gtk_window_get_group(0); GTK.gtk_window_group_add_window (group, handle); GTK.gtk_window_set_modal(handle, true); PrinterData data = null; @@ -384,7 +384,7 @@ public PrinterData open() { Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent (); int signalId = 0; - long /*int*/ hookId = 0; + long hookId = 0; if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, ((LONG) display.getData (GET_EMISSION_PROC_KEY)).value, handle, 0); @@ -412,7 +412,7 @@ public PrinterData open() { OS.g_signal_remove_emission_hook (signalId, hookId); } if (response == GTK.GTK_RESPONSE_OK) { - long /*int*/ printer = GTK.gtk_print_unix_dialog_get_selected_printer(handle); + long printer = GTK.gtk_print_unix_dialog_get_selected_printer(handle); if (printer != 0) { /* Get state from print dialog. */ settings = GTK.gtk_print_unix_dialog_get_settings(handle); // must unref @@ -426,7 +426,7 @@ public PrinterData open() { case GTK.GTK_PRINT_PAGES_RANGES: data.scope = PrinterData.PAGE_RANGE; int[] num_ranges = new int[1]; - long /*int*/ page_ranges = GTK.gtk_print_settings_get_page_ranges(settings, num_ranges); + long page_ranges = GTK.gtk_print_settings_get_page_ranges(settings, num_ranges); int [] pageRange = new int[2]; int length = num_ranges[0]; int min = Integer.MAX_VALUE, max = 0; @@ -448,7 +448,7 @@ public PrinterData open() { data.printToFile = Printer.GTK_FILE_BACKEND.equals(data.driver); // TODO: GTK_FILE_BACKEND is not GTK API (see gtk bug 345590) if (data.printToFile) { - long /*int*/ address = GTK.gtk_print_settings_get(settings, GTK.GTK_PRINT_SETTINGS_OUTPUT_URI); + long address = GTK.gtk_print_settings_get(settings, GTK.GTK_PRINT_SETTINGS_OUTPUT_URI); int length = C.strlen (address); byte [] buffer = new byte [length]; C.memmove (buffer, address, length); @@ -465,7 +465,7 @@ public PrinterData open() { /* Save other print_settings data as key/value pairs in otherData. */ Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$ - long /*int*/ GtkPrintSettingsFunc = printSettingsCallback.getAddress(); + long GtkPrintSettingsFunc = printSettingsCallback.getAddress(); if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); index = 0; settingsData = new byte[1024]; @@ -481,7 +481,7 @@ public PrinterData open() { store("bottom_margin", GTK.gtk_page_setup_get_bottom_margin(page_setup, GTK.GTK_UNIT_MM)); //$NON-NLS-1$ store("left_margin", GTK.gtk_page_setup_get_left_margin(page_setup, GTK.GTK_UNIT_MM)); //$NON-NLS-1$ store("right_margin", GTK.gtk_page_setup_get_right_margin(page_setup, GTK.GTK_UNIT_MM)); //$NON-NLS-1$ - long /*int*/ paper_size = GTK.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$ + long paper_size = GTK.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$ storeBytes("paper_size_name", GTK.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$ storeBytes("paper_size_display_name", GTK.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$ storeBytes("paper_size_ppd_name", GTK.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$ @@ -498,7 +498,7 @@ public PrinterData open() { return data; } -long /*int*/ GtkPrintSettingsFunc (long /*int*/ key, long /*int*/ value, long /*int*/ data) { +long GtkPrintSettingsFunc (long key, long value, long data) { int length = C.strlen (key); byte [] keyBuffer = new byte [length]; C.memmove (keyBuffer, key, length); @@ -521,7 +521,7 @@ void store(String key, boolean value) { store(key, String.valueOf(value)); } -void storeBytes(String key, long /*int*/ value) { +void storeBytes(String key, long value) { int length = C.strlen (value); byte [] valueBuffer = new byte [length]; C.memmove (valueBuffer, value, length); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java index ad439a23e2..66152e29ea 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java @@ -44,16 +44,16 @@ import org.eclipse.swt.internal.gtk.*; */ public final class Printer extends Device { static PrinterData [] printerList; - static long /*int*/ findPrinter; + static long findPrinter; static PrinterData findData; PrinterData data; - long /*int*/ printer; - long /*int*/ printJob; - long /*int*/ settings; - long /*int*/ pageSetup; - long /*int*/ surface; - long /*int*/ cairo; + long printer; + long printJob; + long settings; + long pageSetup; + long surface; + long cairo; /** * whether or not a GC was created for this printer @@ -69,7 +69,7 @@ public final class Printer extends Device { static boolean disablePrinting = OS.IsWin32 || System.getProperty("org.eclipse.swt.internal.gtk.disablePrinting") != null; //$NON-NLS-1$ static void gtk_init() { - if (!GTK.gtk_init_check (new long /*int*/ [] {0}, null)) { + if (!GTK.gtk_init_check (new long [] {0}, null)) { SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); } } @@ -88,7 +88,7 @@ public static PrinterData[] getPrinterList() { } gtk_init(); Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_List", 2); //$NON-NLS-1$ - long /*int*/ GtkPrinterFunc_List = printerCallback.getAddress(); + long GtkPrinterFunc_List = printerCallback.getAddress(); if (GtkPrinterFunc_List == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); GTK.gtk_enumerate_printers(GtkPrinterFunc_List, 0, 0, true); /* @@ -102,7 +102,7 @@ public static PrinterData[] getPrinterList() { return printerList; } -static long /*int*/ GtkPrinterFunc_List (long /*int*/ printer, long /*int*/ user_data) { +static long GtkPrinterFunc_List (long printer, long user_data) { int length = printerList.length; PrinterData [] newList = new PrinterData [length + 1]; System.arraycopy (printerList, 0, newList, 0, length); @@ -136,7 +136,7 @@ public static PrinterData getDefaultPrinterData() { } gtk_init(); Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_Default", 2); //$NON-NLS-1$ - long /*int*/ GtkPrinterFunc_Default = printerCallback.getAddress(); + long GtkPrinterFunc_Default = printerCallback.getAddress(); if (GtkPrinterFunc_Default == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); GTK.gtk_enumerate_printers(GtkPrinterFunc_Default, 0, 0, true); /* @@ -150,7 +150,7 @@ public static PrinterData getDefaultPrinterData() { return findData; } -static long /*int*/ GtkPrinterFunc_Default (long /*int*/ printer, long /*int*/ user_data) { +static long GtkPrinterFunc_Default (long printer, long user_data) { if (GTK.gtk_printer_is_default(printer)) { findData = printerDataFromGtkPrinter(printer); return 1; @@ -158,10 +158,10 @@ static long /*int*/ GtkPrinterFunc_Default (long /*int*/ printer, long /*int*/ u return 0; } -static long /*int*/ gtkPrinterFromPrinterData(PrinterData data) { +static long gtkPrinterFromPrinterData(PrinterData data) { gtk_init(); Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_FindNamedPrinter", 2); //$NON-NLS-1$ - long /*int*/ GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress(); + long GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress(); if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); findPrinter = 0; findData = data; @@ -177,7 +177,7 @@ static long /*int*/ gtkPrinterFromPrinterData(PrinterData data) { return findPrinter; } -static long /*int*/ GtkPrinterFunc_FindNamedPrinter (long /*int*/ printer, long /*int*/ user_data) { +static long GtkPrinterFunc_FindNamedPrinter (long printer, long user_data) { PrinterData pd = printerDataFromGtkPrinter(printer); if ((pd.driver.equals(findData.driver) && pd.name.equals(findData.name)) || (pd.driver.equals(GTK_FILE_BACKEND)) && findData.printToFile && findData.driver == null && findData.name == null) { @@ -189,9 +189,9 @@ static long /*int*/ GtkPrinterFunc_FindNamedPrinter (long /*int*/ printer, long return 0; } -static PrinterData printerDataFromGtkPrinter(long /*int*/ printer) { - long /*int*/ backend = GTK.gtk_printer_get_backend(printer); - long /*int*/ address = OS.G_OBJECT_TYPE_NAME(backend); +static PrinterData printerDataFromGtkPrinter(long printer) { + long backend = GTK.gtk_printer_get_backend(printer); + long address = OS.G_OBJECT_TYPE_NAME(backend); int length = C.strlen (address); byte [] buffer = new byte [length]; C.memmove (buffer, address, length); @@ -209,7 +209,7 @@ static PrinterData printerDataFromGtkPrinter(long /*int*/ printer) { /* * Restore printer settings and page_setup data from data. */ -static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup) { +static void restore(byte [] data, long settings, long page_setup) { settingsData = data; start = end = 0; while (end < settingsData.length && settingsData[end] != 0) { @@ -242,7 +242,7 @@ static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup double width = restoreDouble("paper_size_width"); //$NON-NLS-1$ double height = restoreDouble("paper_size_height"); //$NON-NLS-1$ boolean custom = restoreBoolean("paper_size_is_custom"); //$NON-NLS-1$ - long /*int*/ paper_size = 0; + long paper_size = 0; if (custom) { if (ppd_name.length > 0) { paper_size = GTK.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height); @@ -263,12 +263,12 @@ static byte [] uriFromFilename(String filename) { char[] chars = new char[length]; filename.getChars(0, length, chars, 0); long /*int*/[] error = new long /*int*/[1]; - long /*int*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); + long utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); if (error[0] != 0 || utf8Ptr == 0) return null; - long /*int*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); + long localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); OS.g_free(utf8Ptr); if (error[0] != 0 || localePtr == 0) return null; - long /*int*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error); + long uriPtr = OS.g_filename_to_uri(localePtr, 0, error); OS.g_free(localePtr); if (error[0] != 0 || uriPtr == 0) return null; length = C.strlen(uriPtr); @@ -283,7 +283,7 @@ static DeviceData checkNull (PrinterData data) { if (data.driver == null || data.name == null) { PrinterData defaultData = null; if (data.printToFile) { - long /*int*/ filePrinter = gtkPrinterFromPrinterData(data); + long filePrinter = gtkPrinterFromPrinterData(data); if (filePrinter != 0) { defaultData = printerDataFromGtkPrinter(filePrinter); OS.g_object_unref(filePrinter); @@ -391,9 +391,9 @@ static byte [] restoreBytes(String key, boolean nullTerminate) { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC(GCData data) { - long /*int*/ drawable = 0; - long /*int*/ gc = cairo; +public long internal_new_GC(GCData data) { + long drawable = 0; + long gc = cairo; if (gc == 0) SWT.error (SWT.ERROR_NO_HANDLES); if (data != null) { if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT); @@ -440,7 +440,7 @@ public long /*int*/ internal_new_GC(GCData data) { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC(long /*int*/ hDC, GCData data) { +public void internal_dispose_GC(long hDC, GCData data) { if (data != null) isGCCreated = false; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java index d09b65ba57..05e9ba0c87 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java @@ -149,16 +149,16 @@ public static Program[] getPrograms() { public ImageData getImageData() { if (iconPath == null) return null; ImageData data = null; - long /*int*/ icon_theme =GTK.gtk_icon_theme_get_default(); + long icon_theme =GTK.gtk_icon_theme_get_default(); byte[] icon = Converter.wcsToMbcs (iconPath, true); - long /*int*/ gicon = OS.g_icon_new_for_string(icon, null); + long gicon = OS.g_icon_new_for_string(icon, null); if (gicon != 0) { - long /*int*/ gicon_info = GTK.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0); + long gicon_info = GTK.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0); if (gicon_info != 0) { - long /*int*/ pixbuf = GTK.gtk_icon_info_load_icon(gicon_info, null); + long pixbuf = GTK.gtk_icon_info_load_icon(gicon_info, null); if (pixbuf != 0) { int stride = GDK.gdk_pixbuf_get_rowstride(pixbuf); - long /*int*/ pixels = GDK.gdk_pixbuf_get_pixels(pixbuf); + long pixels = GDK.gdk_pixbuf_get_pixels(pixbuf); int height = GDK.gdk_pixbuf_get_height(pixbuf); int width = GDK.gdk_pixbuf_get_width(pixbuf); boolean hasAlpha = GDK.gdk_pixbuf_get_has_alpha(pixbuf); @@ -255,19 +255,19 @@ static String gio_getMimeType(String extension) { static Program gio_getProgram(Display display, String mimeType) { Program program = null; byte[] mimeTypeBuffer = Converter.wcsToMbcs (mimeType, true); - long /*int*/ application = OS.g_app_info_get_default_for_type (mimeTypeBuffer, false); + long application = OS.g_app_info_get_default_for_type (mimeTypeBuffer, false); if (application != 0) { program = gio_getProgram(display, application); } return program; } -static Program gio_getProgram (Display display, long /*int*/ application) { +static Program gio_getProgram (Display display, long application) { Program program = new Program(); program.display = display; int length; byte[] buffer; - long /*int*/ applicationName = OS.g_app_info_get_name (application); + long applicationName = OS.g_app_info_get_name (application); if (applicationName != 0) { length = C.strlen (applicationName); if (length > 0) { @@ -276,7 +276,7 @@ static Program gio_getProgram (Display display, long /*int*/ application) { program.name = new String (Converter.mbcsToWcs (buffer)); } } - long /*int*/ applicationCommand = OS.g_app_info_get_executable (application); + long applicationCommand = OS.g_app_info_get_executable (application); if (applicationCommand != 0) { length = C.strlen (applicationCommand); if (length > 0) { @@ -286,9 +286,9 @@ static Program gio_getProgram (Display display, long /*int*/ application) { } } program.gioExpectUri = OS.g_app_info_supports_uris(application); - long /*int*/ icon = OS.g_app_info_get_icon(application); + long icon = OS.g_app_info_get_icon(application); if (icon != 0) { - long /*int*/ icon_name = OS.g_icon_to_string(icon); + long icon_name = OS.g_icon_to_string(icon); if (icon_name != 0) { length = C.strlen(icon_name); if (length > 0) { @@ -308,12 +308,12 @@ static Program gio_getProgram (Display display, long /*int*/ application) { * become public and the original method above can be deprecated. */ static Program[] getPrograms(Display display) { - long /*int*/ applicationList = OS.g_app_info_get_all (); - long /*int*/ list = applicationList; + long applicationList = OS.g_app_info_get_all (); + long list = applicationList; Program program; LinkedHashSet programs = new LinkedHashSet<>(); while (list != 0) { - long /*int*/ application = OS.g_list_data(list); + long application = OS.g_list_data(list); if (application != 0) { //TODO: Should the list be filtered or not? // if (OS.g_app_info_should_show(application)) { @@ -331,13 +331,13 @@ static boolean isExecutable(String fileName) { byte[] fileNameBuffer = Converter.wcsToMbcs (fileName, true); if (OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_DIR)) return false; if (!OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_EXECUTABLE)) return false; - long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer); + long file = OS.g_file_new_for_path (fileNameBuffer); boolean result = false; if (file != 0) { byte[] buffer = Converter.wcsToMbcs ("*", true); //$NON-NLS-1$ - long /*int*/ fileInfo = OS.g_file_query_info(file, buffer, 0, 0, 0); + long fileInfo = OS.g_file_query_info(file, buffer, 0, 0, 0); if (fileInfo != 0) { - long /*int*/ contentType = OS.g_file_info_get_content_type(fileInfo); + long contentType = OS.g_file_info_get_content_type(fileInfo); if (contentType != 0) { byte[] exeType = Converter.wcsToMbcs ("application/x-executable", true); //$NON-NLS-1$ result = OS.g_content_type_is_a(contentType, exeType); @@ -359,9 +359,9 @@ static boolean isExecutable(String fileName) { static boolean gio_launch(String fileName) { boolean result = false; byte[] fileNameBuffer = Converter.wcsToMbcs (fileName, true); - long /*int*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer); + long file = OS.g_file_new_for_commandline_arg (fileNameBuffer); if (file != 0) { - long /*int*/ uri = OS.g_file_get_uri (file); + long uri = OS.g_file_get_uri (file); if (uri != 0) { result = OS.g_app_info_launch_default_for_uri (uri, 0, 0); OS.g_free(uri); @@ -378,11 +378,11 @@ boolean gio_execute(String fileName) { boolean result = false; byte[] commandBuffer = Converter.wcsToMbcs (command, true); byte[] nameBuffer = Converter.wcsToMbcs (name, true); - long /*int*/ application = OS.g_app_info_create_from_commandline(commandBuffer, nameBuffer, gioExpectUri + long application = OS.g_app_info_create_from_commandline(commandBuffer, nameBuffer, gioExpectUri ? OS.G_APP_INFO_CREATE_SUPPORTS_URIS : OS.G_APP_INFO_CREATE_NONE, 0); if (application != 0) { byte[] fileNameBuffer = Converter.wcsToMbcs (fileName, true); - long /*int*/ file = 0; + long file = 0; if (fileName.length() > 0) { if (OS.g_app_info_supports_uris (application)) { file = OS.g_file_new_for_uri (fileNameBuffer); @@ -390,7 +390,7 @@ boolean gio_execute(String fileName) { file = OS.g_file_new_for_path (fileNameBuffer); } } - long /*int*/ list = 0; + long list = 0; if (file != 0) list = OS.g_list_append (0, file); result = OS.g_app_info_launch (application, list, 0, 0); if (list != 0) { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c index 686437b6e5..985d6a9e97 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2018 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -49,18 +49,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(JSClassDefinition_1sizeof) #endif #ifndef NO__1JSClassCreate -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSClassCreate_FUNC); /* - rc = (jintLong)JSClassCreate(arg0); + rc = (jlong)JSClassCreate(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSClassCreate) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSClassCreate_FUNC); @@ -69,18 +69,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) #endif #ifndef NO__1JSContextGetGlobalObject -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSContextGetGlobalObject_FUNC); /* - rc = (jintLong)JSContextGetGlobalObject(arg0); + rc = (jlong)JSContextGetGlobalObject(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSContextGetGlobalObject) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSContextGetGlobalObject_FUNC); @@ -89,20 +89,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) #endif #ifndef NO__1JSEvaluateScript -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintLongArray arg5) { jintLong *lparg5=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSEvaluateScript_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSEvaluateScript(arg0, arg1, arg2, arg3, arg4, lparg5); + rc = (jlong)JSEvaluateScript(arg0, arg1, arg2, arg3, arg4, lparg5); */ { WebKitGTK_LOAD_FUNCTION(fp, JSEvaluateScript) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); } } fail: @@ -113,18 +113,18 @@ fail: #endif #ifndef NO__1JSObjectGetPrivate -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPrivate_FUNC); /* - rc = (jintLong)JSObjectGetPrivate(arg0); + rc = (jlong)JSObjectGetPrivate(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPrivate) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPrivate_FUNC); @@ -133,20 +133,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) #endif #ifndef NO__1JSObjectGetProperty -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jintLongArray arg3) { jintLong *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetProperty_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSObjectGetProperty(arg0, arg1, arg2, lparg3); + rc = (jlong)JSObjectGetProperty(arg0, arg1, arg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetProperty) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong *))fp)(arg0, arg1, arg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jintLong *))fp)(arg0, arg1, arg2, lparg3); } } fail: @@ -157,20 +157,20 @@ fail: #endif #ifndef NO__1JSObjectGetPropertyAtIndex -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintLongArray arg3) { jintLong *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPropertyAtIndex_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSObjectGetPropertyAtIndex(arg0, arg1, arg2, lparg3); + rc = (jlong)JSObjectGetPropertyAtIndex(arg0, arg1, arg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPropertyAtIndex) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3); } } fail: @@ -181,18 +181,18 @@ fail: #endif #ifndef NO__1JSObjectMake -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMake_FUNC); /* - rc = (jintLong)JSObjectMake(arg0, arg1, arg2); + rc = (jlong)JSObjectMake(arg0, arg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectMake) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMake_FUNC); @@ -201,22 +201,22 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) #endif #ifndef NO__1JSObjectMakeArray -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3) { jintLong *lparg2=NULL; jintLong *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeArray_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSObjectMakeArray(arg0, arg1, lparg2, lparg3); + rc = (jlong)JSObjectMakeArray(arg0, arg1, lparg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeArray) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3); } } fail: @@ -228,18 +228,18 @@ fail: #endif #ifndef NO__1JSObjectMakeFunctionWithCallback -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); /* - rc = (jintLong)JSObjectMakeFunctionWithCallback(arg0, arg1, arg2); + rc = (jlong)JSObjectMakeFunctionWithCallback(arg0, arg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeFunctionWithCallback) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); @@ -249,7 +249,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) #ifndef NO__1JSObjectSetProperty JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintLongArray arg5) { jintLong *lparg5=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectSetProperty_FUNC); @@ -260,7 +260,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty) { WebKitGTK_LOAD_FUNCTION(fp, JSObjectSetProperty) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); + ((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); } } fail: @@ -270,20 +270,20 @@ fail: #endif #ifndef NO__1JSStringCreateWithUTF8CString -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringCreateWithUTF8CString_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSStringCreateWithUTF8CString(lparg0); + rc = (jlong)JSStringCreateWithUTF8CString(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringCreateWithUTF8CString) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -294,18 +294,18 @@ fail: #endif #ifndef NO__1JSStringGetLength -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetLength_FUNC); /* - rc = (jintLong)JSStringGetLength(arg0); + rc = (jlong)JSStringGetLength(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringGetLength) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetLength_FUNC); @@ -314,18 +314,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) #endif #ifndef NO__1JSStringGetMaximumUTF8CStringSize -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); /* - rc = (jintLong)JSStringGetMaximumUTF8CStringSize(arg0); + rc = (jlong)JSStringGetMaximumUTF8CStringSize(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringGetMaximumUTF8CStringSize) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); @@ -334,20 +334,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) #endif #ifndef NO__1JSStringGetUTF8CString -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSStringGetUTF8CString(arg0, lparg1, arg2); + rc = (jlong)JSStringGetUTF8CString(arg0, lparg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringGetUTF8CString) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong))fp)(arg0, lparg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jbyte *, jlong))fp)(arg0, lparg1, arg2); } } fail: @@ -359,7 +359,7 @@ fail: #ifndef NO__1JSStringIsEqualToUTF8CString JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jint rc = 0; @@ -371,7 +371,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString) { WebKitGTK_LOAD_FUNCTION(fp, JSStringIsEqualToUTF8CString) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -383,7 +383,7 @@ fail: #ifndef NO__1JSStringRelease JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1JSStringRelease_FUNC); /* @@ -392,7 +392,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) { WebKitGTK_LOAD_FUNCTION(fp, JSStringRelease) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringRelease_FUNC); @@ -401,7 +401,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) #ifndef NO__1JSValueGetType JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueGetType_FUNC); @@ -411,7 +411,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) { WebKitGTK_LOAD_FUNCTION(fp, JSValueGetType) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueGetType_FUNC); @@ -421,7 +421,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) #ifndef NO__1JSValueIsObjectOfClass JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueIsObjectOfClass_FUNC); @@ -431,7 +431,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) { WebKitGTK_LOAD_FUNCTION(fp, JSValueIsObjectOfClass) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueIsObjectOfClass_FUNC); @@ -440,18 +440,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) #endif #ifndef NO__1JSValueMakeBoolean -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeBoolean_FUNC); /* - rc = (jintLong)JSValueMakeBoolean(arg0, arg1); + rc = (jlong)JSValueMakeBoolean(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeBoolean) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeBoolean_FUNC); @@ -460,18 +460,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) #endif #ifndef NO__1JSValueMakeNumber -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeNumber_FUNC); /* - rc = (jintLong)JSValueMakeNumber(arg0, arg1); + rc = (jlong)JSValueMakeNumber(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeNumber) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jdouble))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeNumber_FUNC); @@ -480,18 +480,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) #endif #ifndef NO__1JSValueMakeString -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeString_FUNC); /* - rc = (jintLong)JSValueMakeString(arg0, arg1); + rc = (jlong)JSValueMakeString(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeString) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeString_FUNC); @@ -500,18 +500,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) #endif #ifndef NO__1JSValueMakeUndefined -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeUndefined_FUNC); /* - rc = (jintLong)JSValueMakeUndefined(arg0); + rc = (jlong)JSValueMakeUndefined(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeUndefined) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeUndefined_FUNC); @@ -521,7 +521,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) #ifndef NO__1JSValueToNumber JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; jdouble rc = 0; @@ -533,7 +533,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber) { WebKitGTK_LOAD_FUNCTION(fp, JSValueToNumber) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong, jlong, jintLong *))fp)(arg0, arg1, lparg2); } } fail: @@ -544,20 +544,20 @@ fail: #endif #ifndef NO__1JSValueToStringCopy -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToStringCopy_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSValueToStringCopy(arg0, arg1, lparg2); + rc = (jlong)JSValueToStringCopy(arg0, arg1, lparg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueToStringCopy) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *))fp)(arg0, arg1, lparg2); } } fail: @@ -568,12 +568,12 @@ fail: #endif #ifndef NO__1SoupCookie_1expires -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1SoupCookie_1expires_FUNC); - rc = (jintLong)((SoupCookie *)arg0)->expires; + rc = (jlong)((SoupCookie *)arg0)->expires; WebKitGTK_NATIVE_EXIT(env, that, _1SoupCookie_1expires_FUNC); return rc; } @@ -581,7 +581,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) #ifndef NO__1SoupMessage_1method JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1SoupMessage_1method) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1SoupMessage_1method_FUNC); ((SoupMessage *)arg0)->method = ((const char *)arg1); @@ -590,24 +590,24 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1SoupMessage_1method) #endif #ifndef NO__1SoupMessage_1request_1body -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1body) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1body) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1SoupMessage_1request_1body_FUNC); - rc = (jintLong)((SoupMessage *)arg0)->request_body; + rc = (jlong)((SoupMessage *)arg0)->request_body; WebKitGTK_NATIVE_EXIT(env, that, _1SoupMessage_1request_1body_FUNC); return rc; } #endif #ifndef NO__1SoupMessage_1request_1headers -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1SoupMessage_1request_1headers_FUNC); - rc = (jintLong)((SoupMessage *)arg0)->request_headers; + rc = (jlong)((SoupMessage *)arg0)->request_headers; WebKitGTK_NATIVE_EXIT(env, that, _1SoupMessage_1request_1headers_FUNC); return rc; } @@ -615,7 +615,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) #ifndef NO__1soup_1auth_1authenticate JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -628,7 +628,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) { WebKitGTK_LOAD_FUNCTION(fp, soup_auth_authenticate) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); } } fail: @@ -639,18 +639,18 @@ fail: #endif #ifndef NO__1soup_1auth_1get_1host -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1host_FUNC); /* - rc = (jintLong)soup_auth_get_host(arg0); + rc = (jlong)soup_auth_get_host(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_host) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1host_FUNC); @@ -659,18 +659,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) #endif #ifndef NO__1soup_1auth_1get_1scheme_1name -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); /* - rc = (jintLong)soup_auth_get_scheme_name(arg0); + rc = (jlong)soup_auth_get_scheme_name(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_scheme_name) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); @@ -680,7 +680,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) #ifndef NO__1soup_1cookie_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1free_FUNC); /* @@ -689,7 +689,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1free) { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_free) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1free_FUNC); @@ -698,7 +698,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1free) #ifndef NO__1soup_1cookie_1jar_1add_1cookie JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); /* @@ -707,7 +707,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_add_cookie) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); @@ -715,18 +715,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) #endif #ifndef NO__1soup_1cookie_1jar_1all_1cookies -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); /* - rc = (jintLong)soup_cookie_jar_all_cookies(arg0); + rc = (jlong)soup_cookie_jar_all_cookies(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_all_cookies) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); @@ -736,7 +736,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) #ifndef NO__1soup_1cookie_1jar_1delete_1cookie JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); /* @@ -745,7 +745,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_delete_cookie) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); @@ -753,18 +753,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) #endif #ifndef NO__1soup_1cookie_1jar_1get_1cookies -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); /* - rc = (jintLong)soup_cookie_jar_get_cookies(arg0, arg1, arg2); + rc = (jlong)soup_cookie_jar_get_cookies(arg0, arg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_cookies) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint))fp)(arg0, arg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jint))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); @@ -773,18 +773,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) #endif #ifndef NO__1soup_1cookie_1jar_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); /* - rc = (jintLong)soup_cookie_jar_get_type(); + rc = (jlong)soup_cookie_jar_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); @@ -793,20 +793,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) #endif #ifndef NO__1soup_1cookie_1parse -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1parse_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)soup_cookie_parse(lparg0, arg1); + rc = (jlong)soup_cookie_parse(lparg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_parse) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jintLong))fp)(lparg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *, jlong))fp)(lparg0, arg1); } } fail: @@ -818,7 +818,7 @@ fail: #ifndef NO__1soup_1message_1body_1append JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1append_FUNC); /* @@ -827,7 +827,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) { WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_append) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); + ((void (CALLING_CONVENTION*)(jlong, jint, jlong, jlong))fp)(arg0, arg1, arg2, arg3); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1append_FUNC); @@ -836,7 +836,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) #ifndef NO__1soup_1message_1body_1flatten JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1flatten_FUNC); /* @@ -845,7 +845,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) { WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_flatten) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1flatten_FUNC); @@ -853,18 +853,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) #endif #ifndef NO__1soup_1message_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1get_1uri_FUNC); /* - rc = (jintLong)soup_message_get_uri(arg0); + rc = (jlong)soup_message_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_message_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1get_1uri_FUNC); @@ -874,7 +874,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) #ifndef NO__1soup_1message_1headers_1append JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -887,7 +887,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append) { WebKitGTK_LOAD_FUNCTION(fp, soup_message_headers_append) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); } } fail: @@ -899,7 +899,7 @@ fail: #ifndef NO__1soup_1session_1add_1feature_1by_1type JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); /* @@ -908,7 +908,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) { WebKitGTK_LOAD_FUNCTION(fp, soup_session_add_feature_by_type) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); @@ -917,7 +917,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) #ifndef NO__1soup_1session_1feature_1attach JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1attach_FUNC); /* @@ -926,7 +926,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) { WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_attach) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1attach_FUNC); @@ -935,7 +935,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) #ifndef NO__1soup_1session_1feature_1detach JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1detach_FUNC); /* @@ -944,7 +944,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) { WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_detach) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1detach_FUNC); @@ -952,18 +952,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) #endif #ifndef NO__1soup_1session_1get_1feature -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC); /* - rc = (jintLong)soup_session_get_feature(arg0, arg1); + rc = (jlong)soup_session_get_feature(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_feature) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1feature_FUNC); @@ -972,18 +972,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) #endif #ifndef NO__1soup_1session_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1type_FUNC); /* - rc = (jintLong)soup_session_get_type(); + rc = (jlong)soup_session_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1type_FUNC); @@ -993,7 +993,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) #ifndef NO__1soup_1uri_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1free_FUNC); /* @@ -1002,7 +1002,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) { WebKitGTK_LOAD_FUNCTION(fp, soup_uri_free) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1free_FUNC); @@ -1010,20 +1010,20 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) #endif #ifndef NO__1soup_1uri_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)soup_uri_new(lparg0); + rc = (jlong)soup_uri_new(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_uri_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -1034,18 +1034,18 @@ fail: #endif #ifndef NO__1soup_1uri_1to_1string -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1to_1string_FUNC); /* - rc = (jintLong)soup_uri_to_string(arg0, arg1); + rc = (jlong)soup_uri_to_string(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_uri_to_string) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1to_1string_FUNC); @@ -1055,7 +1055,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) #ifndef NO__1webkit_1authentication_1request_1authenticate JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1authenticate) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1authentication_1request_1authenticate_FUNC); /* @@ -1064,7 +1064,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1authe { WebKitGTK_LOAD_FUNCTION(fp, webkit_authentication_request_authenticate) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1authentication_1request_1authenticate_FUNC); @@ -1073,7 +1073,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1authe #ifndef NO__1webkit_1authentication_1request_1cancel JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1cancel) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1authentication_1request_1cancel_FUNC); /* @@ -1082,7 +1082,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1cance { WebKitGTK_LOAD_FUNCTION(fp, webkit_authentication_request_cancel) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1authentication_1request_1cancel_FUNC); @@ -1091,7 +1091,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1cance #ifndef NO__1webkit_1authentication_1request_1is_1retry JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1is_1retry) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1authentication_1request_1is_1retry_FUNC); @@ -1101,7 +1101,7 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1i { WebKitGTK_LOAD_FUNCTION(fp, webkit_authentication_request_is_retry) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1authentication_1request_1is_1retry_FUNC); @@ -1111,7 +1111,7 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1i #ifndef NO__1webkit_1credential_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1credential_1free_FUNC); /* @@ -1120,7 +1120,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1free) { WebKitGTK_LOAD_FUNCTION(fp, webkit_credential_free) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1credential_1free_FUNC); @@ -1128,22 +1128,22 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1free) #endif #ifndef NO__1webkit_1credential_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1new) (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2) { jbyte *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1credential_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_credential_new(lparg0, lparg1, arg2); + rc = (jlong)webkit_credential_new(lparg0, lparg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_credential_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jint))fp)(lparg0, lparg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *, jbyte *, jint))fp)(lparg0, lparg1, arg2); } } fail: @@ -1156,7 +1156,7 @@ fail: #ifndef NO__1webkit_1dom_1event_1target_1add_1event_1listener JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1event_1target_1add_1event_1listener) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jlong arg4) { jbyte *lparg1=NULL; jint rc = 0; @@ -1168,7 +1168,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1event_1target_1add_1event { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_event_target_add_event_listener) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jint, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jbyte *, jlong, jint, jlong))fp)(arg0, lparg1, arg2, arg3, arg4); } } fail: @@ -1180,7 +1180,7 @@ fail: #ifndef NO__1webkit_1dom_1mouse_1event_1get_1alt_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1alt_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1alt_1key_FUNC); @@ -1190,7 +1190,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1alt_1k { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_alt_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1alt_1key_FUNC); @@ -1200,7 +1200,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1alt_1k #ifndef NO__1webkit_1dom_1mouse_1event_1get_1button JNIEXPORT jshort JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1button) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jshort rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1button_FUNC); @@ -1210,7 +1210,7 @@ JNIEXPORT jshort JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1butt { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_button) if (fp) { - rc = (jshort)((jshort (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jshort)((jshort (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1button_FUNC); @@ -1220,7 +1220,7 @@ JNIEXPORT jshort JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1butt #ifndef NO__1webkit_1dom_1mouse_1event_1get_1ctrl_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1ctrl_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1ctrl_1key_FUNC); @@ -1230,7 +1230,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1ctrl_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_ctrl_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1ctrl_1key_FUNC); @@ -1240,7 +1240,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1ctrl_1 #ifndef NO__1webkit_1dom_1mouse_1event_1get_1meta_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1meta_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1meta_1key_FUNC); @@ -1250,7 +1250,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1meta_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_meta_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1meta_1key_FUNC); @@ -1260,7 +1260,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1meta_1 #ifndef NO__1webkit_1dom_1mouse_1event_1get_1screen_1x JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1screen_1x) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1x_FUNC); @@ -1270,7 +1270,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_screen_x) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1x_FUNC); @@ -1280,7 +1280,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree #ifndef NO__1webkit_1dom_1mouse_1event_1get_1screen_1y JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1screen_1y) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1y_FUNC); @@ -1290,7 +1290,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_screen_y) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1y_FUNC); @@ -1300,7 +1300,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree #ifndef NO__1webkit_1dom_1mouse_1event_1get_1shift_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1shift_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1shift_1key_FUNC); @@ -1310,7 +1310,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1shift_ { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_shift_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1shift_1key_FUNC); @@ -1320,7 +1320,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1shift_ #ifndef NO__1webkit_1dom_1ui_1event_1get_1char_1code JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1char_1code) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1char_1code_FUNC); @@ -1330,7 +1330,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1char_1co { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_char_code) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1char_1code_FUNC); @@ -1340,7 +1340,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1char_1co #ifndef NO__1webkit_1dom_1ui_1event_1get_1detail JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1detail) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1detail_FUNC); @@ -1350,7 +1350,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1detail) { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_detail) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1detail_FUNC); @@ -1360,7 +1360,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1detail) #ifndef NO__1webkit_1dom_1ui_1event_1get_1key_1code JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1key_1code) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1key_1code_FUNC); @@ -1370,7 +1370,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1key_1cod { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_key_code) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1key_1code_FUNC); @@ -1380,7 +1380,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1key_1cod #ifndef NO__1webkit_1download_1cancel JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1cancel_FUNC); /* @@ -1389,7 +1389,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_cancel) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1cancel_FUNC); @@ -1398,7 +1398,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) #ifndef NO__1webkit_1download_1get_1current_1size JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1current_1size_FUNC); @@ -1408,7 +1408,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_current_size) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1current_1size_FUNC); @@ -1417,18 +1417,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) #endif #ifndef NO__1webkit_1download_1get_1network_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1network_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1network_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1network_1request_FUNC); /* - rc = (jintLong)webkit_download_get_network_request(arg0); + rc = (jlong)webkit_download_get_network_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_network_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1network_1request_FUNC); @@ -1438,7 +1438,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1network_1re #ifndef NO__1webkit_1download_1get_1received_1data_1length JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1received_1data_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1received_1data_1length_FUNC); @@ -1448,7 +1448,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1received_1data { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_received_data_length) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1received_1data_1length_FUNC); @@ -1457,18 +1457,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1received_1data #endif #ifndef NO__1webkit_1download_1get_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1request_FUNC); /* - rc = (jintLong)webkit_download_get_request(arg0); + rc = (jlong)webkit_download_get_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1request_FUNC); @@ -1477,18 +1477,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1request) #endif #ifndef NO__1webkit_1download_1get_1response -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1response) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1response) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1response_FUNC); /* - rc = (jintLong)webkit_download_get_response(arg0); + rc = (jlong)webkit_download_get_response(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_response) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1response_FUNC); @@ -1498,7 +1498,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1response) #ifndef NO__1webkit_1download_1get_1status JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1status_FUNC); @@ -1508,7 +1508,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_status) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1status_FUNC); @@ -1517,18 +1517,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) #endif #ifndef NO__1webkit_1download_1get_1suggested_1filename -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1filename) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1filename) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); /* - rc = (jintLong)webkit_download_get_suggested_filename(arg0); + rc = (jlong)webkit_download_get_suggested_filename(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_suggested_filename) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); @@ -1538,7 +1538,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1 #ifndef NO__1webkit_1download_1get_1total_1size JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1total_1size_FUNC); @@ -1548,7 +1548,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_total_size) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1total_1size_FUNC); @@ -1557,18 +1557,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) #endif #ifndef NO__1webkit_1download_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1type_FUNC); /* - rc = (jintLong)webkit_download_get_type(); + rc = (jlong)webkit_download_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1type_FUNC); @@ -1577,18 +1577,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1type) #endif #ifndef NO__1webkit_1download_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1uri_FUNC); /* - rc = (jintLong)webkit_download_get_uri(arg0); + rc = (jlong)webkit_download_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1uri_FUNC); @@ -1597,18 +1597,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) #endif #ifndef NO__1webkit_1download_1get_1web_1view -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1web_1view) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1web_1view) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1web_1view_FUNC); /* - rc = (jintLong)webkit_download_get_web_view(arg0); + rc = (jlong)webkit_download_get_web_view(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_web_view) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1web_1view_FUNC); @@ -1617,18 +1617,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1web_1view) #endif #ifndef NO__1webkit_1download_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1new_FUNC); /* - rc = (jintLong)webkit_download_new(arg0); + rc = (jlong)webkit_download_new(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1new_FUNC); @@ -1638,7 +1638,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1new) #ifndef NO__1webkit_1download_1set_1allow_1overwrite JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1allow_1overwrite) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1allow_1overwrite_FUNC); /* @@ -1647,7 +1647,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1allow_1overwrit { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_allow_overwrite) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jboolean))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1set_1allow_1overwrite_FUNC); @@ -1656,7 +1656,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1allow_1overwrit #ifndef NO__1webkit_1download_1set_1destination JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_FUNC); @@ -1667,7 +1667,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -1678,7 +1678,7 @@ fail: #ifndef NO__1webkit_1download_1set_1destination_1uri JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); @@ -1689,7 +1689,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1ur { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination_uri) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -1700,7 +1700,7 @@ fail: #ifndef NO__1webkit_1download_1start JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1start) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1start_FUNC); /* @@ -1709,7 +1709,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1start) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_start) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1start_FUNC); @@ -1718,7 +1718,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1start) #ifndef NO__1webkit_1favicon_1database_1set_1path JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1favicon_1database_1set_1path) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1favicon_1database_1set_1path_FUNC); /* @@ -1727,7 +1727,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1favicon_1database_1set_1path) { WebKitGTK_LOAD_FUNCTION(fp, webkit_favicon_database_set_path) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1favicon_1database_1set_1path_FUNC); @@ -1735,18 +1735,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1favicon_1database_1set_1path) #endif #ifndef NO__1webkit_1get_1default_1session -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1get_1default_1session_FUNC); /* - rc = (jintLong)webkit_get_default_session(); + rc = (jlong)webkit_get_default_session(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_get_default_session) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1get_1default_1session_FUNC); @@ -1755,18 +1755,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) #endif #ifndef NO__1webkit_1get_1favicon_1database -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1favicon_1database) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1favicon_1database) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1get_1favicon_1database_FUNC); /* - rc = (jintLong)webkit_get_favicon_database(); + rc = (jlong)webkit_get_favicon_database(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_get_favicon_database) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1get_1favicon_1database_FUNC); @@ -1836,7 +1836,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1get_1minor_1version) #ifndef NO__1webkit_1hit_1test_1result_1context_1is_1link JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1context_1is_1link) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1context_1is_1link_FUNC); @@ -1846,7 +1846,7 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1context { WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_context_is_link) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1context_1is_1link_FUNC); @@ -1855,18 +1855,18 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1context #endif #ifndef NO__1webkit_1hit_1test_1result_1get_1link_1title -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1title) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1title) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1get_1link_1title_FUNC); /* - rc = (jintLong)webkit_hit_test_result_get_link_title(arg0); + rc = (jlong)webkit_hit_test_result_get_link_title(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_get_link_title) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1get_1link_1title_FUNC); @@ -1875,18 +1875,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1li #endif #ifndef NO__1webkit_1hit_1test_1result_1get_1link_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1get_1link_1uri_FUNC); /* - rc = (jintLong)webkit_hit_test_result_get_link_uri(arg0); + rc = (jlong)webkit_hit_test_result_get_link_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_get_link_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1get_1link_1uri_FUNC); @@ -1895,18 +1895,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1li #endif #ifndef NO__1webkit_1javascript_1result_1get_1global_1context -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1global_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1global_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1javascript_1result_1get_1global_1context_FUNC); /* - rc = (jintLong)webkit_javascript_result_get_global_context((gpointer)arg0); + rc = (jlong)webkit_javascript_result_get_global_context((gpointer)arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_javascript_result_get_global_context) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1javascript_1result_1get_1global_1context_FUNC); @@ -1915,18 +1915,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1g #endif #ifndef NO__1webkit_1javascript_1result_1get_1value -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1value) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1value) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1javascript_1result_1get_1value_FUNC); /* - rc = (jintLong)webkit_javascript_result_get_value((gpointer)arg0); + rc = (jlong)webkit_javascript_result_get_value((gpointer)arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_javascript_result_get_value) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1javascript_1result_1get_1value_FUNC); @@ -1936,7 +1936,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1v #ifndef NO__1webkit_1javascript_1result_1unref JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1javascript_1result_1unref_FUNC); /* @@ -1945,7 +1945,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1unref) { WebKitGTK_LOAD_FUNCTION(fp, webkit_javascript_result_unref) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1javascript_1result_1unref_FUNC); @@ -2013,18 +2013,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1minor_1version) #endif #ifndef NO__1webkit_1navigation_1policy_1decision_1get_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1navigation_1policy_1decision_1get_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1navigation_1policy_1decision_1get_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1navigation_1policy_1decision_1get_1request_FUNC); /* - rc = (jintLong)webkit_navigation_policy_decision_get_request(arg0); + rc = (jlong)webkit_navigation_policy_decision_get_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_navigation_policy_decision_get_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1navigation_1policy_1decision_1get_1request_FUNC); @@ -2033,18 +2033,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1navigation_1policy_1decisi #endif #ifndef NO__1webkit_1network_1request_1get_1message -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1message) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1message) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1message_FUNC); /* - rc = (jintLong)webkit_network_request_get_message(arg0); + rc = (jlong)webkit_network_request_get_message(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_message) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1message_FUNC); @@ -2053,18 +2053,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1mes #endif #ifndef NO__1webkit_1network_1request_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1uri_FUNC); /* - rc = (jintLong)webkit_network_request_get_uri(arg0); + rc = (jlong)webkit_network_request_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1uri_FUNC); @@ -2073,20 +2073,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri #endif #ifndef NO__1webkit_1network_1request_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_network_request_new(lparg0); + rc = (jlong)webkit_network_request_new(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -2098,7 +2098,7 @@ fail: #ifndef NO__1webkit_1policy_1decision_1download JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1download) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1policy_1decision_1download_FUNC); /* @@ -2107,7 +2107,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1download) { WebKitGTK_LOAD_FUNCTION(fp, webkit_policy_decision_download) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1policy_1decision_1download_FUNC); @@ -2116,7 +2116,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1download) #ifndef NO__1webkit_1policy_1decision_1ignore JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1ignore) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1policy_1decision_1ignore_FUNC); /* @@ -2125,7 +2125,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1ignore) { WebKitGTK_LOAD_FUNCTION(fp, webkit_policy_decision_ignore) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1policy_1decision_1ignore_FUNC); @@ -2133,18 +2133,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1ignore) #endif #ifndef NO__1webkit_1response_1policy_1decision_1get_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1response_1policy_1decision_1get_1request_FUNC); /* - rc = (jintLong)webkit_response_policy_decision_get_request(arg0); + rc = (jlong)webkit_response_policy_decision_get_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_response_policy_decision_get_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1response_1policy_1decision_1get_1request_FUNC); @@ -2153,18 +2153,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision #endif #ifndef NO__1webkit_1response_1policy_1decision_1get_1response -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1response) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1response) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1response_1policy_1decision_1get_1response_FUNC); /* - rc = (jintLong)webkit_response_policy_decision_get_response(arg0); + rc = (jlong)webkit_response_policy_decision_get_response(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_response_policy_decision_get_response) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1response_1policy_1decision_1get_1response_FUNC); @@ -2173,18 +2173,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision #endif #ifndef NO__1webkit_1soup_1auth_1dialog_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); /* - rc = (jintLong)webkit_soup_auth_dialog_get_type(); + rc = (jlong)webkit_soup_auth_dialog_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_soup_auth_dialog_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); @@ -2193,18 +2193,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1t #endif #ifndef NO__1webkit_1uri_1request_1get_1http_1headers -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1http_1headers) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1http_1headers) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1request_1get_1http_1headers_FUNC); /* - rc = (jintLong)webkit_uri_request_get_http_headers(arg0); + rc = (jlong)webkit_uri_request_get_http_headers(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_request_get_http_headers) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1request_1get_1http_1headers_FUNC); @@ -2213,18 +2213,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1http_1h #endif #ifndef NO__1webkit_1uri_1request_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1request_1get_1uri_FUNC); /* - rc = (jintLong)webkit_uri_request_get_uri(arg0); + rc = (jlong)webkit_uri_request_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_request_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1request_1get_1uri_FUNC); @@ -2233,20 +2233,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1uri) #endif #ifndef NO__1webkit_1uri_1request_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1request_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_uri_request_new(lparg0); + rc = (jlong)webkit_uri_request_new(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_request_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -2258,7 +2258,7 @@ fail: #ifndef NO__1webkit_1uri_1response_1get_1content_1length JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1content_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1response_1get_1content_1length_FUNC); @@ -2268,7 +2268,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1content_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_response_get_content_length) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1response_1get_1content_1length_FUNC); @@ -2277,18 +2277,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1content_1 #endif #ifndef NO__1webkit_1uri_1response_1get_1mime_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1mime_1type) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1mime_1type) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1response_1get_1mime_1type_FUNC); /* - rc = (jintLong)webkit_uri_response_get_mime_type(arg0); + rc = (jlong)webkit_uri_response_get_mime_type(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_response_get_mime_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1response_1get_1mime_1type_FUNC); @@ -2297,20 +2297,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1mime_1 #endif #ifndef NO__1webkit_1web_1context_1allow_1tls_1certificate_1for_1host -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1allow_1tls_1certificate_1for_1host) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1allow_1tls_1certificate_1for_1host) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2) { jbyte *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1allow_1tls_1certificate_1for_1host_FUNC); if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_web_context_allow_tls_certificate_for_host(arg0, arg1, lparg2); + rc = (jlong)webkit_web_context_allow_tls_certificate_for_host(arg0, arg1, lparg2); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_allow_tls_certificate_for_host) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jbyte *))fp)(arg0, arg1, lparg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jbyte *))fp)(arg0, arg1, lparg2); } } fail: @@ -2321,18 +2321,18 @@ fail: #endif #ifndef NO__1webkit_1web_1context_1get_1default -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1default) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1get_1default_FUNC); /* - rc = (jintLong)webkit_web_context_get_default(); + rc = (jlong)webkit_web_context_get_default(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_get_default) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1get_1default_FUNC); @@ -2341,18 +2341,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1default #endif #ifndef NO__1webkit_1web_1context_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1get_1type_FUNC); /* - rc = (jintLong)webkit_web_context_get_type(); + rc = (jlong)webkit_web_context_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1get_1type_FUNC); @@ -2361,18 +2361,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1type) #endif #ifndef NO__1webkit_1web_1context_1get_1website_1data_1manager -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1website_1data_1manager) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1website_1data_1manager) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1get_1website_1data_1manager_FUNC); /* - rc = (jintLong)webkit_web_context_get_website_data_manager(arg0); + rc = (jlong)webkit_web_context_get_website_data_manager(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_get_website_data_manager) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1get_1website_1data_1manager_FUNC); @@ -2382,7 +2382,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1website #ifndef NO__1webkit_1web_1context_1set_1tls_1errors_1policy JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1tls_1errors_1policy) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1set_1tls_1errors_1policy_FUNC); /* @@ -2391,7 +2391,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1tls_1errors { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_set_tls_errors_policy) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1set_1tls_1errors_1policy_FUNC); @@ -2400,7 +2400,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1tls_1errors #ifndef NO__1webkit_1web_1context_1set_1web_1extensions_1directory JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extensions_1directory) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1set_1web_1extensions_1directory_FUNC); @@ -2411,7 +2411,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extens { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_set_web_extensions_directory) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -2439,18 +2439,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extens #endif #ifndef NO__1webkit_1web_1data_1source_1get_1data -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1data) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1data) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); /* - rc = (jintLong)webkit_web_data_source_get_data(arg0); + rc = (jlong)webkit_web_data_source_get_data(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_data) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); @@ -2459,18 +2459,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1da #endif #ifndef NO__1webkit_1web_1data_1source_1get_1encoding -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1encoding) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1encoding) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); /* - rc = (jintLong)webkit_web_data_source_get_encoding(arg0); + rc = (jlong)webkit_web_data_source_get_encoding(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_encoding) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); @@ -2479,18 +2479,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1en #endif #ifndef NO__1webkit_1web_1frame_1get_1data_1source -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1source) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1source) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); /* - rc = (jintLong)webkit_web_frame_get_data_source(arg0); + rc = (jlong)webkit_web_frame_get_data_source(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_data_source) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); @@ -2499,18 +2499,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1sou #endif #ifndef NO__1webkit_1web_1frame_1get_1global_1context -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); /* - rc = (jintLong)webkit_web_frame_get_global_context(arg0); + rc = (jlong)webkit_web_frame_get_global_context(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_global_context) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); @@ -2520,7 +2520,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1c #ifndef NO__1webkit_1web_1frame_1get_1load_1status JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); @@ -2530,7 +2530,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_load_status) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); @@ -2539,18 +2539,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) #endif #ifndef NO__1webkit_1web_1frame_1get_1parent -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); /* - rc = (jintLong)webkit_web_frame_get_parent(arg0); + rc = (jlong)webkit_web_frame_get_parent(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_parent) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); @@ -2559,18 +2559,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) #endif #ifndef NO__1webkit_1web_1frame_1get_1title -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1title_FUNC); /* - rc = (jintLong)webkit_web_frame_get_title(arg0); + rc = (jlong)webkit_web_frame_get_title(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_title) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1title_FUNC); @@ -2579,18 +2579,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) #endif #ifndef NO__1webkit_1web_1frame_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1type_FUNC); /* - rc = (jintLong)webkit_web_frame_get_type(); + rc = (jlong)webkit_web_frame_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1type_FUNC); @@ -2599,18 +2599,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) #endif #ifndef NO__1webkit_1web_1frame_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); /* - rc = (jintLong)webkit_web_frame_get_uri(arg0); + rc = (jlong)webkit_web_frame_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); @@ -2619,18 +2619,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) #endif #ifndef NO__1webkit_1web_1frame_1get_1web_1view -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); /* - rc = (jintLong)webkit_web_frame_get_web_view(arg0); + rc = (jlong)webkit_web_frame_get_web_view(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_web_view) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); @@ -2640,7 +2640,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view #ifndef NO__1webkit_1web_1policy_1decision_1download JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1download) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); /* @@ -2649,7 +2649,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_download) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); @@ -2658,7 +2658,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa #ifndef NO__1webkit_1web_1policy_1decision_1ignore JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); /* @@ -2667,7 +2667,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_ignore) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); @@ -2676,7 +2676,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) #ifndef NO__1webkit_1web_1resource_1get_1data JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1resource_1get_1data_FUNC); /* @@ -2685,7 +2685,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_resource_get_data) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); + ((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong))fp)(arg0, arg1, arg2, arg3); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1resource_1get_1data_FUNC); @@ -2693,26 +2693,26 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data) #endif #ifndef NO__1webkit_1web_1resource_1get_1data_1finish -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data_1finish) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data_1finish) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jlongArray arg3) { jintLong *lparg2=NULL; - jintLong *lparg3=NULL; - jintLong rc = 0; + jlong *lparg3=NULL; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1resource_1get_1data_1finish_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_web_resource_get_data_finish(arg0, arg1, lparg2, lparg3); + rc = (jlong)webkit_web_resource_get_data_finish(arg0, arg1, lparg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_resource_get_data_finish) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *, jlong *))fp)(arg0, arg1, lparg2, lparg3); } } fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1resource_1get_1data_1finish_FUNC); return rc; @@ -2721,7 +2721,7 @@ fail: #ifndef NO__1webkit_1web_1view_1can_1go_1back JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); @@ -2731,7 +2731,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_back) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); @@ -2741,7 +2741,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) #ifndef NO__1webkit_1web_1view_1can_1go_1forward JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); @@ -2751,7 +2751,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_forward) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); @@ -2761,7 +2761,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) #ifndef NO__1webkit_1web_1view_1can_1show_1mime_1type JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1type) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); @@ -2771,7 +2771,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_show_mime_type) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); @@ -2781,7 +2781,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty #ifndef NO__1webkit_1web_1view_1execute_1script JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1execute_1script_FUNC); @@ -2792,7 +2792,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_execute_script) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -2802,18 +2802,18 @@ fail: #endif #ifndef NO__1webkit_1web_1view_1get_1context -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1context_FUNC); /* - rc = (jintLong)webkit_web_view_get_context(arg0); + rc = (jlong)webkit_web_view_get_context(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_context) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1context_FUNC); @@ -2822,18 +2822,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1context) #endif #ifndef NO__1webkit_1web_1view_1get_1dom_1document -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1dom_1document) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1dom_1document) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1dom_1document_FUNC); /* - rc = (jintLong)webkit_web_view_get_dom_document(arg0); + rc = (jlong)webkit_web_view_get_dom_document(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_dom_document) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1dom_1document_FUNC); @@ -2843,7 +2843,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1dom_1docum #ifndef NO__1webkit_1web_1view_1get_1estimated_1load_1progress JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1estimated_1load_1progress) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1estimated_1load_1progress_FUNC); @@ -2853,7 +2853,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1estimated_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_estimated_load_progress) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1estimated_1load_1progress_FUNC); @@ -2863,7 +2863,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1estimated_1 #ifndef NO__1webkit_1web_1view_1get_1load_1status JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); @@ -2873,7 +2873,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_load_status) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); @@ -2882,18 +2882,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) #endif #ifndef NO__1webkit_1web_1view_1get_1main_1frame -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1frame) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1frame) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); /* - rc = (jintLong)webkit_web_view_get_main_frame(arg0); + rc = (jlong)webkit_web_view_get_main_frame(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_frame) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); @@ -2902,18 +2902,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1fram #endif #ifndef NO__1webkit_1web_1view_1get_1main_1resource -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1resource) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1resource) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1resource_FUNC); /* - rc = (jintLong)webkit_web_view_get_main_resource(arg0); + rc = (jlong)webkit_web_view_get_main_resource(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_resource) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1resource_FUNC); @@ -2922,18 +2922,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1reso #endif #ifndef NO__1webkit_1web_1view_1get_1page_1id -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1page_1id) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1page_1id) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1page_1id_FUNC); /* - rc = (jintLong)webkit_web_view_get_page_id(arg0); + rc = (jlong)webkit_web_view_get_page_id(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_page_id) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1page_1id_FUNC); @@ -2943,7 +2943,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1page_1id) #ifndef NO__1webkit_1web_1view_1get_1progress JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1progress_FUNC); @@ -2953,7 +2953,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_progress) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1progress_FUNC); @@ -2962,18 +2962,18 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) #endif #ifndef NO__1webkit_1web_1view_1get_1settings -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1settings_FUNC); /* - rc = (jintLong)webkit_web_view_get_settings(arg0); + rc = (jlong)webkit_web_view_get_settings(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_settings) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1settings_FUNC); @@ -2982,18 +2982,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) #endif #ifndef NO__1webkit_1web_1view_1get_1title -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1title_FUNC); /* - rc = (jintLong)webkit_web_view_get_title(arg0); + rc = (jlong)webkit_web_view_get_title(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_title) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1title_FUNC); @@ -3002,18 +3002,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) #endif #ifndef NO__1webkit_1web_1view_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1type_FUNC); /* - rc = (jintLong)webkit_web_view_get_type(); + rc = (jlong)webkit_web_view_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1type_FUNC); @@ -3022,18 +3022,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1type) #endif #ifndef NO__1webkit_1web_1view_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1uri_FUNC); /* - rc = (jintLong)webkit_web_view_get_uri(arg0); + rc = (jlong)webkit_web_view_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1uri_FUNC); @@ -3042,18 +3042,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) #endif #ifndef NO__1webkit_1web_1view_1get_1window_1features -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1features) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1features) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); /* - rc = (jintLong)webkit_web_view_get_window_features(arg0); + rc = (jlong)webkit_web_view_get_window_features(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_features) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); @@ -3062,18 +3062,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1fe #endif #ifndef NO__1webkit_1web_1view_1get_1window_1properties -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1properties) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1properties) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1properties_FUNC); /* - rc = (jintLong)webkit_web_view_get_window_properties(arg0); + rc = (jlong)webkit_web_view_get_window_properties(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_properties) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1properties_FUNC); @@ -3083,7 +3083,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1pr #ifndef NO__1webkit_1web_1view_1go_1back JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1back_FUNC); /* @@ -3092,7 +3092,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_back) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1back_FUNC); @@ -3101,7 +3101,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) #ifndef NO__1webkit_1web_1view_1go_1forward JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1forward_FUNC); /* @@ -3110,7 +3110,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_forward) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1forward_FUNC); @@ -3119,7 +3119,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) #ifndef NO__1webkit_1web_1view_1load_1bytes JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1bytes) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) { jbyte *lparg2=NULL; jbyte *lparg3=NULL; @@ -3134,7 +3134,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1bytes) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_bytes) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jbyte *, jbyte *, jbyte *))fp)(arg0, arg1, lparg2, lparg3, lparg4); + ((void (CALLING_CONVENTION*)(jlong, jlong, jbyte *, jbyte *, jbyte *))fp)(arg0, arg1, lparg2, lparg3, lparg4); } } fail: @@ -3147,7 +3147,7 @@ fail: #ifndef NO__1webkit_1web_1view_1load_1html JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1html) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -3160,7 +3160,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1html) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_html) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); } } fail: @@ -3172,7 +3172,7 @@ fail: #ifndef NO__1webkit_1web_1view_1load_1request JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1request) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1request_FUNC); /* @@ -3181,7 +3181,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1request) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_request) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1load_1request_FUNC); @@ -3190,7 +3190,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1request) #ifndef NO__1webkit_1web_1view_1load_1string JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -3207,7 +3207,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_string) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2, lparg3, lparg4); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2, lparg3, lparg4); } } fail: @@ -3221,7 +3221,7 @@ fail: #ifndef NO__1webkit_1web_1view_1load_1uri JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1uri_FUNC); @@ -3232,7 +3232,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_uri) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -3242,18 +3242,18 @@ fail: #endif #ifndef NO__1webkit_1web_1view_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1new_FUNC); /* - rc = (jintLong)webkit_web_view_new(); + rc = (jlong)webkit_web_view_new(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1new_FUNC); @@ -3263,7 +3263,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) #ifndef NO__1webkit_1web_1view_1reload JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1reload_FUNC); /* @@ -3272,7 +3272,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_reload) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1reload_FUNC); @@ -3281,7 +3281,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) #ifndef NO__1webkit_1web_1view_1run_1javascript JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3, jlong arg4) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1run_1javascript_FUNC); @@ -3292,7 +3292,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_run_javascript) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jlong, jlong, jlong))fp)(arg0, lparg1, arg2, arg3, arg4); } } fail: @@ -3302,20 +3302,20 @@ fail: #endif #ifndef NO__1webkit_1web_1view_1run_1javascript_1finish -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript_1finish) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript_1finish) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1run_1javascript_1finish_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_web_view_run_javascript_finish(arg0, arg1, (GError **)lparg2); + rc = (jlong)webkit_web_view_run_javascript_finish(arg0, arg1, (GError **)lparg2); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_run_javascript_finish) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, GError **))fp)(arg0, arg1, (GError **)lparg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, GError **))fp)(arg0, arg1, (GError **)lparg2); } } fail: @@ -3327,7 +3327,7 @@ fail: #ifndef NO__1webkit_1web_1view_1stop_1loading JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); /* @@ -3336,7 +3336,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_stop_loading) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); @@ -3345,7 +3345,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) #ifndef NO__1webkit_1website_1data_1manager_1clear JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1website_1data_1manager_1clear) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1website_1data_1manager_1clear_FUNC); /* @@ -3354,7 +3354,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1website_1data_1manager_1clear) { WebKitGTK_LOAD_FUNCTION(fp, webkit_website_data_manager_clear) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3, arg4, arg5); + ((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jlong, jlong))fp)(arg0, arg1, arg2, arg3, arg4, arg5); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1website_1data_1manager_1clear_FUNC); @@ -3363,7 +3363,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1website_1data_1manager_1clear) #ifndef NO__1webkit_1window_1properties_1get_1geometry JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1window_1properties_1get_1geometry) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1window_1properties_1get_1geometry_FUNC); @@ -3374,7 +3374,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1window_1properties_1get_1geome { WebKitGTK_LOAD_FUNCTION(fp, webkit_window_properties_get_geometry) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, GdkRectangle *))fp)(arg0, (GdkRectangle *)lparg1); + ((void (CALLING_CONVENTION*)(jlong, GdkRectangle *))fp)(arg0, (GdkRectangle *)lparg1); } } fail: @@ -3385,7 +3385,7 @@ fail: #ifndef NO_memmove JNIEXPORT void JNICALL WebKitGTK_NATIVE(memmove) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { JSClassDefinition _arg1, *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, memmove_FUNC); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c index 7a3a3ead58..3c84951e3e 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -74,21 +74,21 @@ void cacheJSClassDefinitionFields(JNIEnv *env, jobject lpObject) JSClassDefinitionFc.clazz = (*env)->GetObjectClass(env, lpObject); JSClassDefinitionFc.version = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "version", "I"); JSClassDefinitionFc.attributes = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "attributes", "I"); - JSClassDefinitionFc.className = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "className", I_J); - JSClassDefinitionFc.parentClass = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "parentClass", I_J); - JSClassDefinitionFc.staticValues = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticValues", I_J); - JSClassDefinitionFc.staticFunctions = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticFunctions", I_J); - JSClassDefinitionFc.initialize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "initialize", I_J); - JSClassDefinitionFc.finalize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "finalize", I_J); - JSClassDefinitionFc.hasProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasProperty", I_J); - JSClassDefinitionFc.getProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getProperty", I_J); - JSClassDefinitionFc.setProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "setProperty", I_J); - JSClassDefinitionFc.deleteProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "deleteProperty", I_J); - JSClassDefinitionFc.getPropertyNames = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getPropertyNames", I_J); - JSClassDefinitionFc.callAsFunction = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsFunction", I_J); - JSClassDefinitionFc.callAsConstructor = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsConstructor", I_J); - JSClassDefinitionFc.hasInstance = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasInstance", I_J); - JSClassDefinitionFc.convertToType = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "convertToType", I_J); + JSClassDefinitionFc.className = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "className", "J"); + JSClassDefinitionFc.parentClass = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "parentClass", "J"); + JSClassDefinitionFc.staticValues = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticValues", "J"); + JSClassDefinitionFc.staticFunctions = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticFunctions", "J"); + JSClassDefinitionFc.initialize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "initialize", "J"); + JSClassDefinitionFc.finalize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "finalize", "J"); + JSClassDefinitionFc.hasProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasProperty", "J"); + JSClassDefinitionFc.getProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getProperty", "J"); + JSClassDefinitionFc.setProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "setProperty", "J"); + JSClassDefinitionFc.deleteProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "deleteProperty", "J"); + JSClassDefinitionFc.getPropertyNames = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getPropertyNames", "J"); + JSClassDefinitionFc.callAsFunction = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsFunction", "J"); + JSClassDefinitionFc.callAsConstructor = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsConstructor", "J"); + JSClassDefinitionFc.hasInstance = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasInstance", "J"); + JSClassDefinitionFc.convertToType = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "convertToType", "J"); JSClassDefinitionFc.cached = 1; } @@ -97,21 +97,21 @@ JSClassDefinition *getJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSC if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject); lpStruct->version = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.version); lpStruct->attributes = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.attributes); - lpStruct->className = (const char*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.className); - lpStruct->parentClass = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass); - lpStruct->staticValues = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues); - lpStruct->staticFunctions = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions); - lpStruct->initialize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.initialize); - lpStruct->finalize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.finalize); - lpStruct->hasProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty); - lpStruct->getProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty); - lpStruct->setProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty); - lpStruct->deleteProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty); - lpStruct->getPropertyNames = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames); - lpStruct->callAsFunction = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction); - lpStruct->callAsConstructor = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor); - lpStruct->hasInstance = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance); - lpStruct->convertToType = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType); + lpStruct->className = (const char*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.className); + lpStruct->parentClass = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.parentClass); + lpStruct->staticValues = (const void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.staticValues); + lpStruct->staticFunctions = (const void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.staticFunctions); + lpStruct->initialize = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.initialize); + lpStruct->finalize = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.finalize); + lpStruct->hasProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.hasProperty); + lpStruct->getProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.getProperty); + lpStruct->setProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.setProperty); + lpStruct->deleteProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.deleteProperty); + lpStruct->getPropertyNames = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames); + lpStruct->callAsFunction = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.callAsFunction); + lpStruct->callAsConstructor = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor); + lpStruct->hasInstance = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.hasInstance); + lpStruct->convertToType = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.convertToType); return lpStruct; } @@ -120,21 +120,21 @@ void setJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSClassDefinition if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject); (*env)->SetIntField(env, lpObject, JSClassDefinitionFc.version, (jint)lpStruct->version); (*env)->SetIntField(env, lpObject, JSClassDefinitionFc.attributes, (jint)lpStruct->attributes); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.className, (jintLong)lpStruct->className); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass, (jintLong)lpStruct->parentClass); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues, (jintLong)lpStruct->staticValues); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions, (jintLong)lpStruct->staticFunctions); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.initialize, (jintLong)lpStruct->initialize); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.finalize, (jintLong)lpStruct->finalize); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty, (jintLong)lpStruct->hasProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty, (jintLong)lpStruct->getProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty, (jintLong)lpStruct->setProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty, (jintLong)lpStruct->deleteProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames, (jintLong)lpStruct->getPropertyNames); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction, (jintLong)lpStruct->callAsFunction); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor, (jintLong)lpStruct->callAsConstructor); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance, (jintLong)lpStruct->hasInstance); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType, (jintLong)lpStruct->convertToType); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.className, (jlong)lpStruct->className); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.parentClass, (jlong)lpStruct->parentClass); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.staticValues, (jlong)lpStruct->staticValues); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.staticFunctions, (jlong)lpStruct->staticFunctions); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.initialize, (jlong)lpStruct->initialize); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.finalize, (jlong)lpStruct->finalize); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.hasProperty, (jlong)lpStruct->hasProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.getProperty, (jlong)lpStruct->getProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.setProperty, (jlong)lpStruct->setProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.deleteProperty, (jlong)lpStruct->deleteProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames, (jlong)lpStruct->getPropertyNames); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.callAsFunction, (jlong)lpStruct->callAsFunction); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor, (jlong)lpStruct->callAsConstructor); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.hasInstance, (jlong)lpStruct->hasInstance); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.convertToType, (jlong)lpStruct->convertToType); } #endif diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index be699439d2..4240ac0a9f 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -126,12 +126,12 @@ class WebKit extends WebBrowser { * WebKitWebView * Note, as of time at compleating webkit2, (18th April 2018, we ) */ - long /*int*/ webView; - long /*int*/ scrolledWindow; + long webView; + long scrolledWindow; long pageId; /** Webkit1 only. Used by the externalObject for javascript callback to java. */ - long /*int*/ webViewData; + long webViewData; int failureCount, lastKeyCode, lastCharCode; @@ -143,7 +143,7 @@ class WebKit extends WebBrowser { boolean ignoreDispose; // Webkit1 & Webkit2. boolean tlsError; - long /*int*/ tlsErrorCertificate; + long tlsErrorCertificate; String tlsErrorUriString; URI tlsErrorUri; String tlsErrorType; @@ -179,9 +179,9 @@ class WebKit extends WebBrowser { static int DisabledJSCount; /** Webkit1 only. Used for callJava. See JSObjectHasPropertyProc */ - static long /*int*/ ExternalClass; + static long ExternalClass; - static long /*int*/ PostString, WebViewType; + static long PostString, WebViewType; static Map WindowMappings = new HashMap<> (); static Map webKitDownloadStatus = new HashMap<> (); // Webkit2 @@ -310,23 +310,23 @@ class WebKit extends WebBrowser { if (WebKitGTK.webkit_get_minor_version() >= 16) { // TODO: webkit_website_data_manager_clear currently does not // support more fine grained removals. (I.e, session vs all cookies) - long /*int*/ context = WebKitGTK.webkit_web_context_get_default(); - long /*int*/ manager = WebKitGTK.webkit_web_context_get_website_data_manager (context); + long context = WebKitGTK.webkit_web_context_get_default(); + long manager = WebKitGTK.webkit_web_context_get_website_data_manager (context); WebKitGTK.webkit_website_data_manager_clear(manager, WebKitGTK.WEBKIT_WEBSITE_DATA_COOKIES, 0, 0, 0, 0); } else { System.err.println("SWT Webkit. Warning, clear cookies only supported on Webkitgtk version 2.16 and above. Your version is:" + internalGetWebKitVersionStr()); } } else { - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); - long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + long session = WebKitGTK.webkit_get_default_session (); + long type = WebKitGTK.soup_cookie_jar_get_type (); + long jar = WebKitGTK.soup_session_get_feature (session, type); if (jar == 0) return; - long /*int*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar); + long cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar); int length = OS.g_slist_length (cookies); - long /*int*/ current = cookies; + long current = cookies; for (int i = 0; i < length; i++) { - long /*int*/ cookie = OS.g_slist_data (current); - long /*int*/ expires = WebKitGTK.SoupCookie_expires (cookie); + long cookie = OS.g_slist_data (current); + long expires = WebKitGTK.SoupCookie_expires (cookie); if (expires == 0) { /* indicates a session cookie */ WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie); @@ -349,14 +349,14 @@ class WebKit extends WebBrowser { return; } - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); - long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + long session = WebKitGTK.webkit_get_default_session (); + long type = WebKitGTK.soup_cookie_jar_get_type (); + long jar = WebKitGTK.soup_session_get_feature (session, type); if (jar == 0) return; byte[] bytes = Converter.wcsToMbcs (CookieUrl, true); - long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + long uri = WebKitGTK.soup_uri_new (bytes); if (uri == 0) return; - long /*int*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0); + long cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0); WebKitGTK.soup_uri_free (uri); if (cookies == 0) return; int length = C.strlen (cookies); @@ -388,9 +388,9 @@ class WebKit extends WebBrowser { return; } - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); - long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + long session = WebKitGTK.webkit_get_default_session (); + long type = WebKitGTK.soup_cookie_jar_get_type (); + long jar = WebKitGTK.soup_session_get_feature (session, type); if (jar == 0) { /* this happens if a navigation has not occurred yet */ WebKitGTK.soup_session_add_feature_by_type (session, type); @@ -398,10 +398,10 @@ class WebKit extends WebBrowser { } if (jar == 0) return; byte[] bytes = Converter.wcsToMbcs (CookieUrl, true); - long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + long uri = WebKitGTK.soup_uri_new (bytes); if (uri == 0) return; bytes = Converter.wcsToMbcs (CookieValue, true); - long /*int*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri); + long cookie = WebKitGTK.soup_cookie_parse (bytes, uri); if (cookie != 0) { WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie); // the following line is intentionally commented @@ -516,7 +516,7 @@ class WebKit extends WebBrowser { static String getWebExtensionIdentifer() { return webkitWebExtensionIdentifier; } - static String getJavaScriptFunctionDeclaration(long /*int*/ webView) { + static String getJavaScriptFunctionDeclaration(long webView) { return "if (!window.callJava) {\n" + " window.callJava = function callJava(index, token, args) {\n" + " return " + javaScriptFunctionName + "('" + String.valueOf(webView) + "', index, token, args);\n" @@ -569,7 +569,7 @@ class WebKit extends WebBrowser { * See documenation: WebKitWebExtension (Description) */ @SuppressWarnings("unused") // Only called directly from C - private static void initializeWebExtensions_callback (long /*int*/ WebKitWebContext, long /*int*/ user_data) { + private static void initializeWebExtensions_callback (long WebKitWebContext, long user_data) { // 1) GDBus: // Normally we'd first initialize gdbus channel. But gdbus makes Browser slower and isn't always needed. // So WebkitGDBus is lazy-initialized, although it can be initialized here if gdbus is ever needed @@ -606,7 +606,7 @@ class WebKit extends WebBrowser { * (as a note, the webprocess would have to load the gmodule). */ WebKitGTK.webkit_web_context_set_web_extensions_directory(WebKitGTK.webkit_web_context_get_default(), Converter.wcsToMbcs (extensionsFolder, true)); - long /*int*/ gvariantUserData = OS.g_variant_new_int32(uniqueID); + long gvariantUserData = OS.g_variant_new_int32(uniqueID); WebKitGTK.webkit_web_context_set_web_extensions_initialization_user_data(WebKitGTK.webkit_web_context_get_default(), gvariantUserData); } @@ -681,16 +681,16 @@ class WebKit extends WebBrowser { } -static String getString (long /*int*/ strPtr) { +static String getString (long strPtr) { int length = C.strlen (strPtr); byte [] buffer = new byte [length]; C.memmove (buffer, strPtr, length); return new String (Converter.mbcsToWcs (buffer)); } -static Browser FindBrowser (long /*int*/ webView) { +static Browser FindBrowser (long webView) { if (webView == 0) return null; - long /*int*/ parent = GTK.gtk_widget_get_parent (webView); + long parent = GTK.gtk_widget_get_parent (webView); if (WEBKIT1){ parent = GTK.gtk_widget_get_parent (parent); } @@ -714,7 +714,7 @@ static boolean IsInstalled () { * Webkit1 callback. Used when external.callJava is called in javascript. * Not used by Webkit2. */ -static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { +static long JSObjectCallAsFunctionProc (long ctx, long function, long thisObject, long argumentCount, long arguments, long exception) { if (WEBKIT2) { System.err.println("Internal error: SWT JSObjectCallAsFunctionProc. This should never have been called on webkit2."); return 0; @@ -723,7 +723,7 @@ static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ f if (WebKitGTK.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) { return WebKitGTK.JSValueMakeUndefined (ctx); } - long /*int*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject); + long ptr = WebKitGTK.JSObjectGetPrivate (thisObject); long /*int*/[] handle = new long /*int*/[1]; C.memmove (handle, ptr, C.PTR_SIZEOF); Browser browser = FindBrowser (handle[0]); @@ -737,14 +737,14 @@ static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ f * It's used to initialize the 'callJava' function pointer in the 'external' object, * such that external.callJava reaches Java land. */ -static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) { +static long JSObjectGetPropertyProc (long ctx, long object, long propertyName, long exception) { if (WEBKIT2) { System.err.println("Internal error: SWT WebKit.java:JSObjectGetPropertyProc. This should never have been called on webkit2."); return 0; } byte[] bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); - long /*int*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ()); + long name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ()); WebKitGTK.JSStringRelease (name); return function; } @@ -752,7 +752,7 @@ static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ obje /** * Webkit1: Check if the 'external' object regiseterd earlied has the 'callJava' property. */ -static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) { +static long JSObjectHasPropertyProc (long ctx, long object, long propertyName) { if (WEBKIT2) { System.err.println("Internal error: SWT JSObjectHasPropertyProc. This should never have been called on webkit2."); return 0; @@ -761,7 +761,7 @@ static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ obje return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes); } -static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long /*int*/ user_data) { +static long JSDOMEventProc (long arg0, long event, long user_data) { if (WEBKIT1 && GTK.GTK_IS_SCROLLED_WINDOW (arg0)) { /* * Stop the propagation of events that are not consumed by WebKit, before @@ -854,12 +854,12 @@ static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long return 0; } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ user_data) { - long /*int*/ webView = handle; +static long Proc (long handle, long user_data) { + long webView = handle; if (WEBKIT2 && user_data == FINISHED) { // Special case, callback from WebKitDownload instead of webview. - long /*int*/ webKitDownload = handle; + long webKitDownload = handle; return webkit_download_finished(webKitDownload); } @@ -869,7 +869,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ user_data) { return webkit.webViewProc (handle, user_data); } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +static long Proc (long handle, long arg0, long user_data) { // As a note, don't use instance checks like 'G_TYPE_CHECK_INSTANCE_TYPE ' // to determine difference between webview and webcontext as these // don't seem to work reliably for all clients. For some clients they always return true. @@ -883,7 +883,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u // Note, G_TYPE_CHECK_INSTANCE_TYPE is not a good way to test for type. See it's javadoc. // only kept for webkit1 legacy reason. if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) { - long /*int*/ webView = WebKitGTK.webkit_web_frame_get_web_view (handle); // webkit1 only. + long webView = WebKitGTK.webkit_web_frame_get_web_view (handle); // webkit1 only. Browser browser = FindBrowser (webView); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; @@ -894,7 +894,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u if (WEBKIT2 && user_data == DOWNLOAD_STARTED) { // This callback comes from WebKitWebContext as oppose to the WebView. So handle is WebContext not Webview. // user_function (WebKitWebContext *context, WebKitDownload *download, gpointer user_data) - long /*int*/ webKitDownload = arg0; + long webKitDownload = arg0; webkit_download_started(webKitDownload); return 0; } @@ -902,21 +902,21 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u if (WEBKIT2 && user_data == DECIDE_DESTINATION) { // This callback comes from WebKitDownload, so handle is WebKitDownload not webview. // gboolean user_function (WebKitDownload *download, gchar *suggested_filename, gpointer user_data) - long /*int*/ webKitDownload = handle; - long /*int*/ suggested_filename = arg0; + long webKitDownload = handle; + long suggested_filename = arg0; return webkit_download_decide_destination(webKitDownload,suggested_filename); } if (WEBKIT2 && user_data == FAILED) { // void user_function (WebKitDownload *download, GError *error, gpointer user_data) - long /*int*/ webKitDownload = handle; + long webKitDownload = handle; return webkit_download_failed(webKitDownload); } } { // Callbacks connected with a WebView. assert handle != 0 : "Webview shouldn't be null here"; - long /*int*/ webView = handle; + long webView = handle; Browser browser = FindBrowser (webView); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; @@ -924,15 +924,15 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u } } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { +static long Proc (long handle, long arg0, long arg1, long user_data) { Browser browser = FindBrowser (handle); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; return webkit.webViewProc (handle, arg0, arg1, user_data); } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { - long /*int*/ webView; +static long Proc (long handle, long arg0, long arg1, long arg2, long user_data) { + long webView; // Note: G_TYPE_CHECK_INSTANCE_TYPE is not a good way to check for instance type, see it's javadoc. // Kept only for webkit1 legacy reasons. Do not use in new code. @@ -952,7 +952,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { +static long Proc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { Browser browser = FindBrowser (handle); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; @@ -960,7 +960,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } /** Webkit1 only */ -long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ auth, long /*int*/ retrying, long /*int*/ user_data) { +long sessionProc (long session, long msg, long auth, long retrying, long user_data) { /* authentication challenges are currently the only notification received from the session */ assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; if (retrying == 0) { @@ -969,8 +969,8 @@ long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ a if (++failureCount >= 3) return 0; } - long /*int*/ uri = WebKitGTK.soup_message_get_uri (msg); - long /*int*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0); + long uri = WebKitGTK.soup_message_get_uri (msg); + long uriString = WebKitGTK.soup_uri_to_string (uri, 0); int length = C.strlen (uriString); byte[] bytes = new byte[length]; C.memmove (bytes, uriString, length); @@ -1001,7 +1001,7 @@ long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ a * - gboolean user_function (WebKitWebView *web_view, WebKitAuthenticationRequest *request, gpointer user_data) * - https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#WebKitWebView-authenticate */ -long /*int*/ webkit_authenticate (long /*int*/ web_view, long /*int*/ request){ +long webkit_authenticate (long web_view, long request){ /* authentication challenges are currently the only notification received from the session */ if (!WebKitGTK.webkit_authentication_request_is_retry(request)) { @@ -1033,7 +1033,7 @@ long /*int*/ webkit_authenticate (long /*int*/ web_view, long /*int*/ request){ if (event.user != null && event.password != null) { byte[] userBytes = Converter.wcsToMbcs (event.user, true); byte[] passwordBytes = Converter.wcsToMbcs (event.password, true); - long /*int*/ credentials = WebKitGTK.webkit_credential_new (userBytes, passwordBytes, WebKitGTK.WEBKIT_CREDENTIAL_PERSISTENCE_NONE); + long credentials = WebKitGTK.webkit_credential_new (userBytes, passwordBytes, WebKitGTK.WEBKIT_CREDENTIAL_PERSISTENCE_NONE); WebKitGTK.webkit_authentication_request_authenticate(request, credentials); WebKitGTK.webkit_credential_free(credentials); return 0; @@ -1042,7 +1042,7 @@ long /*int*/ webkit_authenticate (long /*int*/ web_view, long /*int*/ request){ return 0; } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ user_data) { +long webViewProc (long handle, long user_data) { switch ((int)/*64*/user_data) { case CLOSE_WEB_VIEW: return webkit_close_web_view (handle); case WEB_VIEW_READY: return webkit_web_view_ready (handle); @@ -1050,7 +1050,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ user_data) { } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long user_data) { switch ((int)/*64*/user_data) { case CREATE_WEB_VIEW: return webkit_create_web_view (handle, arg0); case DOWNLOAD_REQUESTED: return webkit_download_requested (handle, arg0); // webkit1 @@ -1065,7 +1065,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long arg1, long user_data) { switch ((int)/*64*/user_data) { case HOVERING_OVER_LINK: return webkit_hovering_over_link (handle, arg0, arg1); // Webkit1 only case MOUSE_TARGET_CHANGED: return webkit_mouse_target_changed (handle, arg0, arg1); // Webkit2 only. @@ -1074,7 +1074,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long arg1, long arg2, long user_data) { switch ((int)/*64*/user_data) { case CONSOLE_MESSAGE: return webkit_console_message (handle, arg0, arg1, arg2); case WINDOW_OBJECT_CLEARED: return webkit_window_object_cleared (handle, arg0, arg1, arg2); @@ -1084,7 +1084,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { switch ((int)/*64*/user_data) { case MIME_TYPE_POLICY_DECISION_REQUESTED: return webkit_mime_type_policy_decision_requested (handle, arg0, arg1, arg2, arg3); // Webkit1 case NAVIGATION_POLICY_DECISION_REQUESTED: return webkit_navigation_policy_decision_requested (handle, arg0, arg1, arg2, arg3); @@ -1111,7 +1111,7 @@ public void create (Composite parent, int style) { jsClassDefinition.hasProperty = JSObjectHasPropertyProc.getAddress (); jsClassDefinition.getProperty = JSObjectGetPropertyProc.getAddress (); - long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); + long classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); WebKitGTK.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof); ExternalClass = WebKitGTK.JSClassCreate (classDefinitionPtr); @@ -1129,7 +1129,7 @@ public void create (Composite parent, int style) { * icon database, which should not affect the Browser in any way. */ if (WEBKIT1){ - long /*int*/ database = WebKitGTK.webkit_get_favicon_database (); + long database = WebKitGTK.webkit_get_favicon_database (); if (database != 0) { /* WebKitGTK version is >= 1.8.x */ WebKitGTK.webkit_favicon_database_set_path (database, 0); @@ -1281,7 +1281,7 @@ public void create (Composite parent, int style) { byte[] bytes = Converter.wcsToMbcs ("UTF-8", true); // $NON-NLS-1$ - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0); OS.g_object_set (settings, WebKitGTK.enable_webgl, 1, 0); @@ -1335,8 +1335,8 @@ public void create (Composite parent, int style) { * queue by removing the default Authenticate listener, adding ours, * and then re-adding the default listener. */ - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); + long session = WebKitGTK.webkit_get_default_session (); + long originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); if (originalAuth != 0) { WebKitGTK.soup_session_feature_detach (originalAuth, session); } @@ -1366,7 +1366,7 @@ public void create (Composite parent, int style) { } proxyHost += ":" + port; //$NON-NLS-1$ bytes = Converter.wcsToMbcs (proxyHost, true); - long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + long uri = WebKitGTK.soup_uri_new (bytes); if (uri != 0) { OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0); WebKitGTK.soup_uri_free (uri); @@ -1410,7 +1410,7 @@ public void create (Composite parent, int style) { } } -void addEventHandlers (long /*int*/ web_view, boolean top) { +void addEventHandlers (long web_view, boolean top) { /* * If JS is disabled (causes DOM events to not be delivered) then do not add event * listeners here, DOM events will be inferred from received GDK events instead. @@ -1422,7 +1422,7 @@ void addEventHandlers (long /*int*/ web_view, boolean top) { // TODO implement equivalent? // As a note, this entire function only seems to do webkit1-only stuff at the moment... } else { - long /*int*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view); // Webkit1 only + long domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view); // Webkit1 only if (domDocument != 0) { WindowMappings.put (new LONG (domDocument), new LONG (web_view)); WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.dragstart, JSDOMEventProc.getAddress (), 0, SWT.DragDetect); @@ -1595,10 +1595,10 @@ void nonBlockingExecute(String script) { * @return true if the action succeeded (or was performed asynchronously), false if it failed */ private boolean webkit_extension_modify_function (long pageId, String function, String url, String action){ - long /*int*/ args[] = { OS.g_variant_new_uint64(pageId), + long args[] = { OS.g_variant_new_uint64(pageId), OS.g_variant_new_string (Converter.javaStringToCString(function)), OS.g_variant_new_string (Converter.javaStringToCString(url))}; - final long /*int*/ argsTuple = OS.g_variant_new_tuple(args, args.length); + final long argsTuple = OS.g_variant_new_tuple(args, args.length); if (argsTuple == 0) return false; String dbusMethodName = "webkitgtk_extension_" + action + "_function"; Object returnVal = WebkitGDBus.callExtensionSync(argsTuple, dbusMethodName); @@ -1634,15 +1634,15 @@ public boolean execute (String script) { return true; } else { byte[] scriptBytes = (script + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ jsScriptString = WebKitGTK.JSStringCreateWithUTF8CString (scriptBytes); + long jsScriptString = WebKitGTK.JSStringCreateWithUTF8CString (scriptBytes); // Currently loaded website will be used as 'source file' of the javascript to be exucuted. byte[] sourceUrlbytes = (getUrl () + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ jsSourceUrlString = WebKitGTK.JSStringCreateWithUTF8CString (sourceUrlbytes); - long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); - long /*int*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame); - long /*int*/ result = WebKitGTK.JSEvaluateScript (context, jsScriptString, 0, jsSourceUrlString, 0, null); + long jsSourceUrlString = WebKitGTK.JSStringCreateWithUTF8CString (sourceUrlbytes); + long frame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long context = WebKitGTK.webkit_web_frame_get_global_context (frame); + long result = WebKitGTK.JSEvaluateScript (context, jsScriptString, 0, jsSourceUrlString, 0, null); WebKitGTK.JSStringRelease (jsSourceUrlString); WebKitGTK.JSStringRelease (jsScriptString); return result != 0; @@ -1732,7 +1732,7 @@ private static class Webkit2AsyncToSync { } } - static Object evaluate (String script, Browser browser, long /*int*/ webView) { + static Object evaluate (String script, Browser browser, long webView) { // /* Wrap script around a temporary function for backwards compatibility, // * user can specify 'return', which may not be at the beginning of the script. // * Valid scripts: @@ -1782,7 +1782,7 @@ private static class Webkit2AsyncToSync { * - call webextension over gdbus, parse return value. * */ - static Object runjavascript(String script, Browser browser, long /*int*/ webView) { + static Object runjavascript(String script, Browser browser, long webView) { if (nonBlockingEvaluate > 0) { // Execute script, but do not wait for async call to complete. (assume it does). Bug 512001. WebKitGTK.webkit_web_view_run_javascript(webView, Converter.wcsToMbcs(script, true), 0, 0, 0); @@ -1808,23 +1808,23 @@ private static class Webkit2AsyncToSync { } @SuppressWarnings("unused") // Only called directly from C (from javascript). - private static void runjavascript_callback (long /*int*/ GObject_source, long /*int*/ GAsyncResult, long /*int*/ user_data) { + private static void runjavascript_callback (long GObject_source, long GAsyncResult, long user_data) { int callbackId = (int) user_data; Webkit2AsyncReturnObj retObj = CallBackMap.getObj(callbackId); if (retObj != null) { // retObj can be null if there was a timeout. - long /*int*/[] gerror = new long /*int*/ [1]; // GError ** - long /*int*/ js_result = WebKitGTK.webkit_web_view_run_javascript_finish(GObject_source, GAsyncResult, gerror); + long /*int*/[] gerror = new long [1]; // GError ** + long js_result = WebKitGTK.webkit_web_view_run_javascript_finish(GObject_source, GAsyncResult, gerror); if (js_result == 0) { - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); OS.g_error_free(gerror[0]); retObj.errorNum = SWT.ERROR_FAILED_EVALUATE; retObj.errorMsg = msg != null ? msg : ""; } else { - long /*int*/ context = WebKitGTK.webkit_javascript_result_get_global_context (js_result); - long /*int*/ value = WebKitGTK.webkit_javascript_result_get_value (js_result); + long context = WebKitGTK.webkit_javascript_result_get_global_context (js_result); + long value = WebKitGTK.webkit_javascript_result_get_value (js_result); try { retObj.returnValue = convertToJava(context, value); @@ -1839,8 +1839,8 @@ private static class Webkit2AsyncToSync { Display.getCurrent().wake(); } - static String getText(Browser browser, long /*int*/ webView) { - long /*int*/ WebKitWebResource = WebKitGTK.webkit_web_view_get_main_resource(webView); + static String getText(Browser browser, long webView) { + long WebKitWebResource = WebKitGTK.webkit_web_view_get_main_resource(webView); if (WebKitWebResource == 0) { // No page yet loaded. return ""; } @@ -1861,13 +1861,13 @@ private static class Webkit2AsyncToSync { } @SuppressWarnings("unused") // Callback only called only by C directly - private static void getText_callback(long /*int*/ WebResource, long /*int*/ GAsyncResult, long /*int*/ user_data) { + private static void getText_callback(long WebResource, long GAsyncResult, long user_data) { int callbackId = (int) user_data; Webkit2AsyncReturnObj retObj = CallBackMap.getObj(callbackId); - long /*int*/[] gsize_len = new long /*int*/ [1]; - long /*int*/[] gerrorRes = new long /*int*/ [1]; // GError ** - long /*int*/ guchar_data = WebKitGTK.webkit_web_resource_get_data_finish(WebResource, GAsyncResult, gsize_len, gerrorRes); + long /*int*/[] gsize_len = new long [1]; + long /*int*/[] gerrorRes = new long [1]; // GError ** + long guchar_data = WebKitGTK.webkit_web_resource_get_data_finish(WebResource, GAsyncResult, gsize_len, gerrorRes); if (gerrorRes[0] != 0 || guchar_data == 0) { OS.g_error_free(gerrorRes[0]); retObj.returnValue = (String) ""; @@ -1957,13 +1957,13 @@ public String getText () { return Webkit2AsyncToSync.getText(browser, webView); } else { // Webkit1 only. - long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); - long /*int*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame); + long frame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long source = WebKitGTK.webkit_web_frame_get_data_source (frame); if (source == 0) return ""; //$NON-NLS-1$ - long /*int*/ data = WebKitGTK.webkit_web_data_source_get_data (source); + long data = WebKitGTK.webkit_web_data_source_get_data (source); if (data == 0) return ""; //$NON-NLS-1$ - long /*int*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source); + long encoding = WebKitGTK.webkit_web_data_source_get_encoding (source); int length = C.strlen (encoding); byte[] bytes = new byte [length]; C.memmove (bytes, encoding, length); @@ -1971,7 +1971,7 @@ public String getText () { length = OS.GString_len (data); bytes = new byte[length]; - long /*int*/ string = OS.GString_str (data); + long string = OS.GString_str (data); C.memmove (bytes, string, length); try { @@ -1989,7 +1989,7 @@ public String getUrl () { System.err.println("SWT Webkit: getUrl() called after widget disposed. Should not have happened.\n" + getInternalErrorMsg()); return null; // Disposed. } - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); /* WebKit auto-navigates to about:blank at startup */ if (uri == 0) return ABOUT_BLANK; @@ -2014,7 +2014,7 @@ public String getUrl () { return url; } -boolean handleDOMEvent (long /*int*/ event, int type) { +boolean handleDOMEvent (long event, int type) { /* * This method handles JS events that are received through the DOM * listener API that was introduced in WebKitGTK 1.4. @@ -2076,7 +2076,7 @@ boolean handleDOMEvent (long /*int*/ event, int type) { /* key event */ int keyEventState = 0; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int eventType = GDK.gdk_event_get_event_type(eventPtr); int [] state = new int[1]; @@ -2374,7 +2374,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int return true; } -long /*int*/ handleLoadCommitted (long /*int*/ uri, boolean top) { +long handleLoadCommitted (long uri, boolean top) { int length = C.strlen (uri); byte[] bytes = new byte[length]; C.memmove (bytes, uri, length); @@ -2476,7 +2476,7 @@ private void fireProgressCompletedEvent(){ /** Webkit1 only. * (Webkit2 equivalent is webkit_load_changed()) */ -long /*int*/ handleLoadFinished (long /*int*/ uri, boolean top) { +long handleLoadFinished (long uri, boolean top) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; int length = C.strlen (uri); byte[] bytes = new byte[length]; @@ -2529,8 +2529,8 @@ long /*int*/ handleLoadFinished (long /*int*/ uri, boolean top) { * the event here with the page's url as the title. */ if (top) { - long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); - long /*int*/ title = WebKitGTK.webkit_web_frame_get_title (frame); + long frame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long title = WebKitGTK.webkit_web_frame_get_title (frame); if (title == 0) { fireNewTitleEvent(url); if (browser.isDisposed ()) return 0; @@ -2593,7 +2593,7 @@ void onDispose (Event e) { // org.eclipse.swt.tests.junit.memoryleak.Test_Memory_Leak.test_Browser() OS.g_object_ref (webView); GTK.gtk_container_remove (GTK.gtk_widget_get_parent (webView), webView); - long /*int*/ webViewTempRef = webView; + long webViewTempRef = webView; browser.getDisplay().asyncExec(() -> { OS.g_object_unref (webViewTempRef); }); @@ -2612,12 +2612,12 @@ void onResize (Event e) { } } -void openDownloadWindow (final long /*int*/ webkitDownload) { +void openDownloadWindow (final long webkitDownload) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; openDownloadWindow(webkitDownload, null); } -void openDownloadWindow (final long /*int*/ webkitDownload, final String suggested_filename) { +void openDownloadWindow (final long webkitDownload, final String suggested_filename) { final Shell shell = new Shell (); String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$ shell.setText (msg); @@ -2629,7 +2629,7 @@ void openDownloadWindow (final long /*int*/ webkitDownload, final String suggest String nameString; if (WEBKIT1) { - long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload); + long name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload); int length = C.strlen (name); byte[] bytes = new byte[length]; C.memmove (bytes, name, length); @@ -2638,11 +2638,11 @@ void openDownloadWindow (final long /*int*/ webkitDownload, final String suggest nameString = suggested_filename; } - long /*int*/ url; + long url; if (WEBKIT1) { url = WebKitGTK.webkit_download_get_uri (webkitDownload); } else { - long /*int*/ request = WebKitGTK.webkit_download_get_request(webkitDownload); + long request = WebKitGTK.webkit_download_get_request(webkitDownload); url = WebKitGTK.webkit_uri_request_get_uri(request); } int length = C.strlen (url); @@ -2719,7 +2719,7 @@ void openDownloadWindow (final long /*int*/ webkitDownload, final String suggest total = WebKitGTK.webkit_download_get_total_size (webkitDownload) / 1024L; } else { current = WebKitGTK.webkit_download_get_received_data_length(webkitDownload) / 1024L; - long /*int*/ response = WebKitGTK.webkit_download_get_response(webkitDownload); + long response = WebKitGTK.webkit_download_get_response(webkitDownload); total = WebKitGTK.webkit_uri_response_get_content_length(response) / 1024L; } String message = Compatibility.getMessage ("SWT_Download_Status", new Object[] {Long.valueOf(current), new Long(total)}); //$NON-NLS-1$ @@ -2816,7 +2816,7 @@ public boolean setUrl (String url, String postData, String[] headers) { * set the value on the WebView when initiating the load request and then * remove it afterwards. */ - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); if (headers != null) { for (int i = 0; i < headers.length; i++) { String current = headers[i]; @@ -2839,8 +2839,8 @@ public boolean setUrl (String url, String postData, String[] headers) { byte[] uriBytes = Converter.wcsToMbcs (url, true); if (WEBKIT2 && postData==null && headers != null) { - long /*int*/ request = WebKitGTK.webkit_uri_request_new (uriBytes); - long /*int*/ requestHeaders = WebKitGTK.webkit_uri_request_get_http_headers (request); + long request = WebKitGTK.webkit_uri_request_new (uriBytes); + long requestHeaders = WebKitGTK.webkit_uri_request_get_http_headers (request); if (requestHeaders != 0) { addRequestHeaders(requestHeaders, headers); } @@ -2857,7 +2857,7 @@ public boolean setUrl (String url, String postData, String[] headers) { final String base_url = url; // Use Webkit User-Agent - long /*int*/ [] user_agent_str_ptr = new long /*int*/ [1]; + long [] user_agent_str_ptr = new long [1]; OS.g_object_get (settings, WebKitGTK.user_agent, user_agent_str_ptr, 0); final String userAgent = Converter.cCharPtrToJavaString(user_agent_str_ptr[0], true); final int lastRequest = w2_bug527738LastRequestCounter.incrementAndGet(); // Webkit 2 only @@ -2942,7 +2942,7 @@ public boolean setUrl (String url, String postData, String[] headers) { byte [] html_bytes = Converter.wcsToMbcs(final_html, false); byte [] mime_type_bytes = final_mime_type != null ? Converter.javaStringToCString(final_mime_type) : Converter.javaStringToCString("text/plain"); byte [] encoding_bytes = final_encoding_type != null ? Converter.wcsToMbcs(final_encoding_type, true) : new byte [] {0}; - long /*int*/ gByte = OS.g_bytes_new(html_bytes, html_bytes.length); + long gByte = OS.g_bytes_new(html_bytes, html_bytes.length); WebKitGTK.webkit_web_view_load_bytes (webView, gByte, mime_type_bytes, encoding_bytes, uriBytes); OS.g_bytes_unref (gByte); // as per glib/tests/keyfile:test_bytes().. OS.g_object_set (settings, WebKitGTK.user_agent, 0, 0); @@ -2967,12 +2967,12 @@ public void stop () { WebKitGTK.webkit_web_view_stop_loading (webView); } -long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ pspec) { +long webframe_notify_load_status (long web_frame, long pspec) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; int status = WebKitGTK.webkit_web_frame_get_load_status (web_frame); switch (status) { case WebKitGTK.WEBKIT_LOAD_COMMITTED: { - long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); + long uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); return handleLoadCommitted (uri, false); } case WebKitGTK.WEBKIT_LOAD_FINISHED: { @@ -2982,9 +2982,9 @@ long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ p * response to navigating to a main document containing frames) then * treat this as a completed load. */ - long /*int*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame); + long parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame); if (WebKitGTK.webkit_web_frame_get_load_status (parentFrame) == WebKitGTK.WEBKIT_LOAD_FINISHED) { - long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); + long uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); return handleLoadFinished (uri, false); } } @@ -3003,7 +3003,7 @@ long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ p * - void user_function (WebKitWebView *web_view, gpointer user_data); // observe *no* return value. * - https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#WebKitWebView-close */ -long /*int*/ webkit_close_web_view (long /*int*/ web_view) { +long webkit_close_web_view (long web_view) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -3024,11 +3024,11 @@ long /*int*/ webkit_close_web_view (long /*int*/ web_view) { return 0; } -long /*int*/ webkit_console_message (long /*int*/ web_view, long /*int*/ message, long /*int*/ line, long /*int*/ source_id) { +long webkit_console_message (long web_view, long message, long line, long source_id) { return 1; /* stop the message from being written to stderr */ } -long /*int*/ webkit_create_web_view (long /*int*/ web_view, long /*int*/ frame) { +long webkit_create_web_view (long web_view, long frame) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -3062,14 +3062,14 @@ long /*int*/ webkit_create_web_view (long /*int*/ web_view, long /*int*/ frame) return 0; } -long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ download) { +long webkit_download_requested (long web_view, long download) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; - long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (download); + long name = WebKitGTK.webkit_download_get_suggested_filename (download); int length = C.strlen (name); byte[] bytes = new byte[length]; C.memmove (bytes, name, length); final String nameString = new String (Converter.mbcsToWcs (bytes)); - final long /*int*/ request = WebKitGTK.webkit_download_get_network_request (download); + final long request = WebKitGTK.webkit_download_get_network_request (download); OS.g_object_ref (request); /* * As of WebKitGTK 1.8.x attempting to show a FileDialog in this callback causes @@ -3084,7 +3084,7 @@ long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ down String path = dialog.open (); if (path != null) { path = URI_FILEROOT + path; - long /*int*/ newDownload = WebKitGTK.webkit_download_new (request); + long newDownload = WebKitGTK.webkit_download_new (request); byte[] uriBytes = Converter.wcsToMbcs (path, true); WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes); openDownloadWindow (newDownload); @@ -3097,7 +3097,7 @@ long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ down return 1; } -static long /*int*/ webkit_download_started(long /*int*/ webKitDownload) { +static long webkit_download_started(long webKitDownload) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; OS._g_signal_connect(webKitDownload, WebKitGTK.decide_destination, Proc3.getAddress(), DECIDE_DESTINATION); OS._g_signal_connect(webKitDownload, WebKitGTK.failed, Proc3.getAddress(), FAILED); @@ -3106,10 +3106,10 @@ static long /*int*/ webkit_download_started(long /*int*/ webKitDownload) { } -static long /*int*/ webkit_download_decide_destination(long /*int*/ webKitDownload, long /*int*/ suggested_filename) { +static long webkit_download_decide_destination(long webKitDownload, long suggested_filename) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; final String fileName = getString(suggested_filename); - long /*int*/ webView = WebKitGTK.webkit_download_get_web_view(webKitDownload); + long webView = WebKitGTK.webkit_download_get_web_view(webKitDownload); if (webView != 0) { Browser browser = FindBrowser (webView); if (browser == null || browser.isDisposed() || browser.isClosing) return 0; @@ -3133,7 +3133,7 @@ static long /*int*/ webkit_download_decide_destination(long /*int*/ webKitDownlo return 0; } -static long /*int*/ webkit_download_finished(long /*int*/ download) { +static long webkit_download_finished(long download) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; // A failed signal may have been recorded prior. The finish signal is now being called. if (!webKitDownloadStatus.containsKey(new LONG(download))) { @@ -3142,7 +3142,7 @@ static long /*int*/ webkit_download_finished(long /*int*/ download) { return 0; } -static long /*int*/ webkit_download_failed(long /*int*/ download) { +static long webkit_download_failed(long download) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; // A cancel may have been issued resulting in this signal call. Preserve the original cause. if (!webKitDownloadStatus.containsKey(new LONG(download))) { @@ -3156,11 +3156,11 @@ static long /*int*/ webkit_download_failed(long /*int*/ download) { * - void user_function (WebKitWebView *web_view, WebKitHitTestResult *hit_test_result, guint modifiers, gpointer user_data) * - https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#WebKitWebView-mouse-target-changed * */ -long /*int*/ webkit_mouse_target_changed (long /*int*/ web_view, long /*int*/ hit_test_result, long /*int*/ modifiers) { +long webkit_mouse_target_changed (long web_view, long hit_test_result, long modifiers) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; if (WebKitGTK.webkit_hit_test_result_context_is_link(hit_test_result)){ - long /*int*/ uri = WebKitGTK.webkit_hit_test_result_get_link_uri(hit_test_result); - long /*int*/ title = WebKitGTK.webkit_hit_test_result_get_link_title(hit_test_result); + long uri = WebKitGTK.webkit_hit_test_result_get_link_uri(hit_test_result); + long title = WebKitGTK.webkit_hit_test_result_get_link_title(hit_test_result); return webkit_hovering_over_link(web_view, title, uri); } @@ -3178,7 +3178,7 @@ long /*int*/ webkit_mouse_target_changed (long /*int*/ web_view, long /*int*/ hi * * Since there is no return value, it is safe to run asynchronously. */ -long /*int*/ webkit_hovering_over_link (long /*int*/ web_view, long /*int*/ title, long /*int*/ uri) { +long webkit_hovering_over_link (long web_view, long title, long uri) { if (uri != 0) { int length = C.strlen (uri); byte[] bytes = new byte[length]; @@ -3202,7 +3202,7 @@ long /*int*/ webkit_hovering_over_link (long /*int*/ web_view, long /*int*/ titl return 0; } -long /*int*/ webkit_mime_type_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ mimetype, long /*int*/ policy_decision) { +long webkit_mime_type_policy_decision_requested (long web_view, long frame, long request, long mimetype, long policy_decision) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0; if (!canShow) { @@ -3213,7 +3213,7 @@ long /*int*/ webkit_mime_type_policy_decision_requested (long /*int*/ web_view, } /** Webkit1 only */ -long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ navigation_action, long /*int*/ policy_decision) { +long webkit_navigation_policy_decision_requested (long web_view, long frame, long request, long navigation_action, long policy_decision) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; if (loadingText) { /* @@ -3225,7 +3225,7 @@ long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, return 0; } - long /*int*/ uri = WebKitGTK.webkit_network_request_get_uri (request); + long uri = WebKitGTK.webkit_network_request_get_uri (request); int length = C.strlen (uri); byte[] bytes = new byte[length]; C.memmove (bytes, uri, length); @@ -3262,7 +3262,7 @@ long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, } /* hook status change signal if frame is a newly-created sub-frame */ - long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); 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) { @@ -3286,15 +3286,15 @@ long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, } /** Webkit2 only */ -long /*int*/ webkit_decide_policy (long /*int*/ web_view, long /*int*/ decision, int decision_type, long /*int*/ user_data) { +long webkit_decide_policy (long web_view, long decision, int decision_type, long user_data) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; switch (decision_type) { case WebKitGTK.WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: - long /*int*/ request = WebKitGTK. webkit_navigation_policy_decision_get_request(decision); + long request = WebKitGTK. webkit_navigation_policy_decision_get_request(decision); if (request == 0){ return 0; } - long /*int*/ uri = WebKitGTK.webkit_uri_request_get_uri (request); + long uri = WebKitGTK.webkit_uri_request_get_uri (request); String url = getString(uri); /* * If the URI indicates that the page is being rendered from memory @@ -3341,8 +3341,8 @@ long /*int*/ webkit_decide_policy (long /*int*/ web_view, long /*int*/ decision, case WebKitGTK.WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION: break; case WebKitGTK.WEBKIT_POLICY_DECISION_TYPE_RESPONSE: - long /*int*/ response = WebKitGTK.webkit_response_policy_decision_get_response(decision); - long /*int*/ mime_type = WebKitGTK.webkit_uri_response_get_mime_type(response); + long response = WebKitGTK.webkit_response_policy_decision_get_response(decision); + long mime_type = WebKitGTK.webkit_uri_response_get_mime_type(response); boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mime_type) != 0; if (!canShow) { WebKitGTK.webkit_policy_decision_download (decision); @@ -3356,16 +3356,16 @@ long /*int*/ webkit_decide_policy (long /*int*/ web_view, long /*int*/ decision, return 0; } -long /*int*/ webkit_notify_load_status (long /*int*/ web_view, long /*int*/ pspec) { +long webkit_notify_load_status (long web_view, long pspec) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; int status = WebKitGTK.webkit_web_view_get_load_status (webView); switch (status) { case WebKitGTK.WEBKIT_LOAD_COMMITTED: { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); return handleLoadCommitted (uri, true); } case WebKitGTK.WEBKIT_LOAD_FINISHED: { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); return handleLoadFinished (uri, true); } } @@ -3376,19 +3376,19 @@ long /*int*/ webkit_notify_load_status (long /*int*/ web_view, long /*int*/ pspe * This method is only called by Webkit2. * The webkit1 equivalent is webkit_window_object_cleared; */ -long /*int*/ webkit_load_changed (long /*int*/ web_view, int status, long user_data) { +long webkit_load_changed (long web_view, int status, long user_data) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; switch (status) { case WebKitGTK.WEBKIT2_LOAD_COMMITTED: { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); return handleLoadCommitted (uri, true); } case WebKitGTK.WEBKIT2_LOAD_FINISHED: { addEventHandlers (web_view, true); - long /*int*/ title = WebKitGTK.webkit_web_view_get_title (webView); + long title = WebKitGTK.webkit_web_view_get_title (webView); if (title == 0) { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); fireNewTitleEvent(getString(uri)); } fireProgressCompletedEvent(); @@ -3412,7 +3412,7 @@ long /*int*/ webkit_load_changed (long /*int*/ web_view, int status, long user_d prompt.setMessage(message); int result = prompt.open(); if (result == SWT.YES) { - long /*int*/ webkitcontext = WebKitGTK.webkit_web_view_get_context(web_view); + long webkitcontext = WebKitGTK.webkit_web_view_get_context(web_view); if (javaHost != null) { byte [] host = Converter.javaStringToCString(javaHost); WebKitGTK.webkit_web_context_allow_tls_certificate_for_host(webkitcontext, tlsErrorCertificate, host); @@ -3442,7 +3442,7 @@ long /*int*/ webkit_load_changed (long /*int*/ web_view, int status, long user_d * Called in cases where a web page failed to load due to TLS errors * (self-signed certificates, as an example). */ -long /*int*/ webkit_load_failed_tls (long /*int*/ web_view, long /*int*/ failing_uri, long /*int*/ certificate, long /*int*/ error) { +long webkit_load_failed_tls (long web_view, long failing_uri, long certificate, long error) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; if (!ignoreTls) { // Set tlsError flag so that the user can be prompted once this "bad" page has finished loading @@ -3499,7 +3499,7 @@ long /*int*/ webkit_load_failed_tls (long /*int*/ web_view, long /*int*/ failing * @throws URISyntaxException if the string violates RFC 2396, or is otherwise * malformed */ -void convertUri (long /*int*/ webkitUri) { +void convertUri (long webkitUri) { try { tlsErrorUriString = Converter.cCharPtrToJavaString(webkitUri, false); tlsErrorUri = new URI (tlsErrorUriString); @@ -3518,7 +3518,7 @@ void convertUri (long /*int*/ webkitUri) { * * No return value required. Thus safe to run asynchronously. */ -long /*int*/ webkit_notify_progress (long /*int*/ web_view, long /*int*/ pspec) { +long webkit_notify_progress (long web_view, long pspec) { assert WEBKIT1 || WEBKIT2; ProgressEvent event = new ProgressEvent (browser); event.display = browser.getDisplay (); @@ -3551,9 +3551,9 @@ long /*int*/ webkit_notify_progress (long /*int*/ web_view, long /*int*/ pspec) * * It doesn't look it would require a return value, so running in asyncExec should be fine. */ -long /*int*/ webkit_notify_title (long /*int*/ web_view, long /*int*/ pspec) { +long webkit_notify_title (long web_view, long pspec) { assert WEBKIT1 || WEBKIT2; - long /*int*/ title = WebKitGTK.webkit_web_view_get_title (webView); + long title = WebKitGTK.webkit_web_view_get_title (webView); String titleString; if (title == 0) { titleString = ""; //$NON-NLS-1$ @@ -3579,7 +3579,7 @@ long /*int*/ webkit_notify_title (long /*int*/ web_view, long /*int*/ pspec) { return 0; } -long /*int*/ webkit_context_menu (long /*int*/ web_view, long /*int*/ context_menu, long /*int*/ eventXXX, long /*int*/ hit_test_result) { +long webkit_context_menu (long web_view, long context_menu, long eventXXX, long hit_test_result) { Point pt = browser.getDisplay ().getCursorLocation (); // might break on Wayland? Wouldn't hurt to verify. Event event = new Event (); event.x = pt.x; @@ -3603,7 +3603,7 @@ long /*int*/ webkit_context_menu (long /*int*/ web_view, long /*int*/ context_me } // Seems to be reached only by Webkit1 at the moment. -long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_menu) { +long webkit_populate_popup (long web_view, long webkit_menu) { Point pt = browser.getDisplay ().getCursorLocation (); Event event = new Event (); event.x = pt.x; @@ -3611,10 +3611,10 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m browser.notifyListeners (SWT.MenuDetect, event); if (!event.doit) { /* clear the menu */ - long /*int*/ children = GTK.gtk_container_get_children (webkit_menu); - long /*int*/ current = children; + long children = GTK.gtk_container_get_children (webkit_menu); + long current = children; while (current != 0) { - long /*int*/ item = OS.g_list_data (current); + long item = OS.g_list_data (current); GTK.gtk_container_remove (webkit_menu, item); current = OS.g_list_next (current); } @@ -3628,10 +3628,10 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m } menu.setVisible (true); /* clear the menu */ - long /*int*/ children = GTK.gtk_container_get_children (webkit_menu); - long /*int*/ current = children; + long children = GTK.gtk_container_get_children (webkit_menu); + long current = children; while (current != 0) { - long /*int*/ item = OS.g_list_data (current); + long item = OS.g_list_data (current); GTK.gtk_container_remove (webkit_menu, item); current = OS.g_list_next (current); } @@ -3640,7 +3640,7 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m return 0; } -private void addRequestHeaders(long /*int*/ requestHeaders, String[] headers){ +private void addRequestHeaders(long requestHeaders, String[] headers){ for (int i = 0; i < headers.length; i++) { String current = headers[i]; if (current != null) { @@ -3659,10 +3659,10 @@ private void addRequestHeaders(long /*int*/ requestHeaders, String[] headers){ } -long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int*/ web_frame, long /*int*/ web_resource, long /*int*/ request, long /*int*/ response) { +long webkit_resource_request_starting (long web_view, long web_frame, long web_resource, long request, long response) { assert WEBKIT1; if (postData != null || headers != null) { - long /*int*/ message = WebKitGTK.webkit_network_request_get_message (request); + long message = WebKitGTK.webkit_network_request_get_message (request); if (message == 0) { headers = null; postData = null; @@ -3670,9 +3670,9 @@ long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int if (postData != null) { // Set the message method type to POST WebKitGTK.SoupMessage_method (message, PostString); - long /*int*/ body = WebKitGTK.SoupMessage_request_body (message); + long body = WebKitGTK.SoupMessage_request_body (message); byte[] bytes = Converter.wcsToMbcs (postData, false); - long /*int*/ data = C.malloc (bytes.length); + long data = C.malloc (bytes.length); 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); @@ -3699,7 +3699,7 @@ long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int } /* headers */ - long /*int*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message); + long requestHeaders = WebKitGTK.SoupMessage_request_headers (message); addRequestHeaders(requestHeaders, headers); headers = null; } @@ -3716,7 +3716,7 @@ long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int * In general, window.status=text is not supported on most newer browsers anymore. * status bar now only changes when you hover you mouse over it. */ -long /*int*/ webkit_status_bar_text_changed (long /*int*/ web_view, long /*int*/ text) { +long webkit_status_bar_text_changed (long web_view, long text) { int length = C.strlen (text); byte[] bytes = new byte[length]; C.memmove (bytes, text, length); @@ -3739,13 +3739,13 @@ long /*int*/ webkit_status_bar_text_changed (long /*int*/ web_view, long /*int*/ * https://webkitgtk.org/reference/webkitgtk/unstable/webkitgtk-webkitwebview.html#WebKitWebView-web-view-ready * Note in webkit2, no return value has to be provided in callback. */ -long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { +long webkit_web_view_ready (long web_view) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; if (WEBKIT1) { - long /*int*/ webKitWebWindowFeatures = WebKitGTK.webkit_web_view_get_window_features (webView); + long webKitWebWindowFeatures = WebKitGTK.webkit_web_view_get_window_features (webView); newEvent.addressBar = webkit_settings_get(webKitWebWindowFeatures, WebKitGTK.locationbar_visible) != 0; newEvent.menuBar = webkit_settings_get(webKitWebWindowFeatures, WebKitGTK.menubar_visible) != 0; newEvent.statusBar = webkit_settings_get(webKitWebWindowFeatures, WebKitGTK.statusbar_visible) != 0; @@ -3760,7 +3760,7 @@ long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { newEvent.size = new Point (width,height); } else { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; - long /*int*/ properties = WebKitGTK.webkit_web_view_get_window_properties(webView); + long properties = WebKitGTK.webkit_web_view_get_window_properties(webView); newEvent.addressBar = webkit_settings_get(properties, WebKitGTK.locationbar_visible) != 0; newEvent.menuBar = webkit_settings_get(properties, WebKitGTK.menubar_visible) != 0; newEvent.statusBar = webkit_settings_get(properties, WebKitGTK.statusbar_visible) != 0; @@ -3805,17 +3805,17 @@ long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { * This method is only called by Webkit1. * The webkit2 equivalent is webkit_load_changed(..):caseWEBKIT2__LOAD_FINISHED */ -long /*int*/ webkit_window_object_cleared (long /*int*/ web_view, long /*int*/ frame, long /*int*/ context, long /*int*/ window_object) { +long webkit_window_object_cleared (long web_view, long frame, long context, long window_object) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; - long /*int*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context); - long /*int*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData); + long globalObject = WebKitGTK.JSContextGetGlobalObject (context); + long externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData); byte[] bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (StandardCharsets.UTF_8); - long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null); WebKitGTK.JSStringRelease (name); registerBrowserFunctions(); // Bug 508217 - long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); boolean top = mainFrame == frame; addEventHandlers (web_view, top); return 0; @@ -3827,13 +3827,13 @@ private int webkit_settings_get(byte [] property) { if (WEBKIT2 && webView == 0) { // already disposed. return -1; // error. } - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); return webkit_settings_get(settings, property); } /** Webkit1 & Webkit2 * @return An integer value for the property is returned. For boolean settings, 0 indicates false, 1 indicates true */ -private int webkit_settings_get(long /*int*/ settings, byte[] property) { +private int webkit_settings_get(long settings, byte[] property) { int[] result = new int[1]; OS.g_object_get (settings, property, result, 0); return result[0]; @@ -3844,7 +3844,7 @@ private void webkit_settings_set(byte [] property, int value) { if (WEBKIT2 && webView == 0) { // already disposed. return; } - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); OS.g_object_set(settings, property, value, 0); } @@ -3857,7 +3857,7 @@ private void registerBrowserFunctions() { /** * Webkit1 callback for javascript to call java. */ -long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { +long callJava (long ctx, long func, long thisObject, long argumentCount, long arguments, long exception) { Object returnValue = null; if (argumentCount == 3) { // Javastring array: , , @@ -3904,14 +3904,14 @@ long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObj return convertToJS (ctx, returnValue); } -long /*int*/ convertToJS (long /*int*/ ctx, Object value) { +long convertToJS (long ctx, Object value) { if (value == null) { return WebKitGTK.JSValueMakeUndefined (ctx); } if (value instanceof String) { byte[] bytes = ((String)value + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes); - long /*int*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef); + long stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long result = WebKitGTK.JSValueMakeString (ctx, stringRef); WebKitGTK.JSStringRelease (stringRef); return result; } @@ -3927,7 +3927,7 @@ long /*int*/ convertToJS (long /*int*/ ctx, Object value) { long /*int*/[] arguments = new long /*int*/[length]; for (int i = 0; i < length; i++) { Object javaObject = arrayValue[i]; - long /*int*/ jsObject = convertToJS (ctx, javaObject); + long jsObject = convertToJS (ctx, javaObject); arguments[i] = jsObject; } return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null); @@ -3936,7 +3936,7 @@ long /*int*/ convertToJS (long /*int*/ ctx, Object value) { return 0; } -static Object convertToJava (long /*int*/ ctx, long /*int*/ value) { +static Object convertToJava (long ctx, long value) { int type = WebKitGTK.JSValueGetType (ctx, value); switch (type) { case WebKitGTK.kJSTypeBoolean: { @@ -3948,9 +3948,9 @@ static Object convertToJava (long /*int*/ ctx, long /*int*/ value) { return Double.valueOf(result); } case WebKitGTK.kJSTypeString: { - long /*int*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null); + long string = WebKitGTK.JSValueToStringCopy (ctx, value, null); if (string == 0) return ""; //$NON-NLS-1$ - long /*int*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string); + long length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string); byte[] bytes = new byte[(int)/*64*/length]; length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length); WebKitGTK.JSStringRelease (string); @@ -3962,15 +3962,15 @@ static Object convertToJava (long /*int*/ ctx, long /*int*/ value) { case WebKitGTK.kJSTypeUndefined: return null; case WebKitGTK.kJSTypeObject: { byte[] bytes = (PROPERTY_LENGTH + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes); - long /*int*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null); + long propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null); WebKitGTK.JSStringRelease (propertyName); type = WebKitGTK.JSValueGetType (ctx, valuePtr); if (type == WebKitGTK.kJSTypeNumber) { int length = (int)WebKitGTK.JSValueToNumber (ctx, valuePtr, null); Object[] result = new Object[length]; for (int i = 0; i < length; i++) { - long /*int*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null); + long current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null); if (current != 0) { result[i] = convertToJava (ctx, current); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java index d7ec16e391..17d0802672 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java @@ -46,7 +46,7 @@ class WebkitGDBus { private static final String webkitWebExtensionIdentifier = WebKit.Webkit2Extension.getWebExtensionIdentifer(); /** Proxy connection to the web extension.*/ - static long /*int*/ proxy; + static long proxy; /** A field that is set to true if the proxy connection has been established, false otherwise */ static boolean proxyToExtension; /** Set to true if there are BrowserFunction objects waiting to be registered with the web extension.*/ @@ -178,12 +178,12 @@ class WebkitGDBus { * @return void. */ @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onBusAcquiredCallback (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { - long /*int*/ gdBusNodeInfo; + private static long onBusAcquiredCallback (long connection, long name, long user_data) { + long gdBusNodeInfo; // Parse XML { - long /*int*/ [] error = new long /*int*/ [1]; + long [] error = new long [1]; gdBusNodeInfo = OS.g_dbus_node_info_new_for_xml(Converter.javaStringToCString(dbus_introspection_xml), error); if (gdBusNodeInfo == 0 || error[0] != 0) { System.err.println("SWT WebkitGDBus: Failed to get introspection data"); @@ -193,9 +193,9 @@ class WebkitGDBus { // Register object { - long /*int*/ [] error = new long /*int*/ [1]; - long /*int*/ interface_info = OS.g_dbus_node_info_lookup_interface(gdBusNodeInfo, Converter.javaStringToCString(INTERFACE_NAME)); - long /*int*/ vtable [] = { handleMethodCallback.getAddress(), 0, 0 }; + long [] error = new long [1]; + long interface_info = OS.g_dbus_node_info_lookup_interface(gdBusNodeInfo, Converter.javaStringToCString(INTERFACE_NAME)); + long vtable [] = { handleMethodCallback.getAddress(), 0, 0 }; // SWT Dev Note: SWT Tool's "32/64 bit" checking mechanism sometimes get's confused by this method signature and shows an incorrect warning. // Other times it validates it fine. We ignore for now as 32bit will be dropped anyway. OS.g_dbus_connection_register_object( @@ -225,14 +225,14 @@ class WebkitGDBus { @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onNameAcquiredCallback (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { + private static long onNameAcquiredCallback (long connection, long name, long user_data) { // Currently not used, but can be used if acquring the gdbus name should trigger something to load. return 0; } @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onNameLostCallback (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { + private static long onNameLostCallback (long connection, long name, long user_data) { assert false : "This code should never have executed"; System.err.println("SWT WebkitGDBus.java: Lost GDBus name. This should never occur"); return 0; @@ -259,11 +259,11 @@ class WebkitGDBus { * @return */ @SuppressWarnings("unused") // Callback only called directly by JNI. - private static long /*int*/ handleMethodCallback ( - long /*int*/ connection, long /*int*/ sender, - long /*int*/ object_path, long /*int*/ interface_name, - long /*int*/ method_name, long /*int*/ gvar_parameters, - long /*int*/ invocation, long /*int*/ user_data) { + private static long handleMethodCallback ( + long connection, long sender, + long object_path, long interface_name, + long method_name, long gvar_parameters, + long invocation, long user_data) { String java_method_name = Converter.cCharPtrToJavaString(method_name, false); Object result = null; @@ -299,11 +299,11 @@ class WebkitGDBus { } @SuppressWarnings("unused") - private static long /*int*/ callExtensionAsyncCallback (long /*int*/ source_object, long /*int*/ res, long /*int*/ user_data) { + private static long callExtensionAsyncCallback (long source_object, long res, long user_data) { long /*int*/[] gerror = new long /*int*/[1]; - long /*int*/ result = OS.g_dbus_proxy_call_finish (proxy, res, gerror); + long result = OS.g_dbus_proxy_call_finish (proxy, res, gerror); if (gerror[0] != 0){ - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); System.err.println("SWT webkit: There was an error executing something asynchronously with the extension (Java callback)."); System.err.println("SWT webkit: the error message provided is " + msg); @@ -323,10 +323,10 @@ class WebkitGDBus { * @param invocation the GDBus invocation to return the value on */ private static void invokeReturnValueExtensionIdentifier (HashMap>> map, - long /*int*/ invocation) { - long /*int*/ resultGVariant; - long /*int*/ builder; - long /*int*/ type = OS.g_variant_type_new(OS.G_VARIANT_TYPE_ARRAY_BROWSER_FUNCS); + long invocation) { + long resultGVariant; + long builder; + long type = OS.g_variant_type_new(OS.G_VARIANT_TYPE_ARRAY_BROWSER_FUNCS); builder = OS.g_variant_builder_new(type); if (builder == 0) return; Object [] tupleArray = new Object[3]; @@ -343,7 +343,7 @@ class WebkitGDBus { tupleArray[0] = (long)-1; tupleArray[1] = ""; tupleArray[2] = ""; - long /*int*/ tupleGVariant = convertJavaToGVariant(tupleArray); + long tupleGVariant = convertJavaToGVariant(tupleArray); if (tupleGVariant != 0) { OS.g_variant_builder_add_value(builder, tupleGVariant); } else { @@ -361,7 +361,7 @@ class WebkitGDBus { } tupleArray[0] = id; System.arraycopy(stringArray, 0, tupleArray, 1, 2); - long /*int*/ tupleGVariant = convertJavaToGVariant(tupleArray); + long tupleGVariant = convertJavaToGVariant(tupleArray); if (tupleGVariant != 0) { OS.g_variant_builder_add_value(builder, tupleGVariant); } else { @@ -376,15 +376,15 @@ class WebkitGDBus { if (!OS.DBUS_TYPE_STRUCT_ARRAY_BROWSER_FUNCS.equals(typeString)) { System.err.println("An error packaging the GVariant occurred: type mismatch."); } - long /*int*/ [] variants = {resultGVariant}; - long /*int*/ finalGVariant = OS.g_variant_new_tuple(variants, 1); + long [] variants = {resultGVariant}; + long finalGVariant = OS.g_variant_new_tuple(variants, 1); OS.g_dbus_method_invocation_return_value(invocation, finalGVariant); OS.g_variant_builder_unref(builder); return; } - private static void invokeReturnValue (Object result, long /*int*/ invocation) { - long /*int*/ resultGVariant = 0; + private static void invokeReturnValue (Object result, long invocation) { + long resultGVariant = 0; try { resultGVariant = convertJavaToGVariant(new Object [] {result}); // Result has to be a tuple. } catch (SWTException e) { @@ -407,13 +407,13 @@ class WebkitGDBus { return true; } else { if (EXTENSION_DBUS_NAME != null && EXTENSION_DBUS_PATH != null) { - long /*int*/ [] error = new long /*int*/ [1]; + long [] error = new long [1]; byte [] name = Converter.javaStringToCString(EXTENSION_DBUS_NAME); byte [] path = Converter.javaStringToCString(EXTENSION_DBUS_PATH); byte [] interfaceName = Converter.javaStringToCString(EXTENSION_INTERFACE_NAME); proxy = OS.g_dbus_proxy_new_for_bus_sync(OS.G_BUS_TYPE_SESSION, OS.G_DBUS_PROXY_FLAGS_NONE, 0, name, path, interfaceName, 0, error); if (error[0] != 0) { - long /*int*/ errMsg = OS.g_error_get_message(error[0]); + long errMsg = OS.g_error_get_message(error[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); OS.g_error_free(error[0]); System.err.println("SWT webkit: there was an error establishing the proxy connection to the extension. " + @@ -435,12 +435,12 @@ class WebkitGDBus { * @param methodName a String representing the DBus method name in the extension * @return an Object representing the return value from DBus in boolean form */ - static Object callExtensionSync (long /*int*/ params, String methodName) { - long /*int*/[] gerror = new long /*int*/ [1]; // GError ** - long /*int*/ gVariant = OS.g_dbus_proxy_call_sync(proxy, Converter.javaStringToCString(methodName), + static Object callExtensionSync (long params, String methodName) { + long /*int*/[] gerror = new long [1]; // GError ** + long gVariant = OS.g_dbus_proxy_call_sync(proxy, Converter.javaStringToCString(methodName), params, OS.G_DBUS_CALL_FLAGS_NO_AUTO_START, 1000, 0, gerror); if (gerror[0] != 0) { - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); /* * Don't print console warnings for timeout errors, as we can handle these ourselves. @@ -471,12 +471,12 @@ class WebkitGDBus { * @param methodName a String representing the DBus method name in the extension * @return true if the extension was called without errors, false otherwise */ - static boolean callExtensionAsync (long /*int*/ params, String methodName) { - long /*int*/[] gerror = new long /*int*/ [1]; // GError ** + static boolean callExtensionAsync (long params, String methodName) { + long /*int*/[] gerror = new long [1]; // GError ** OS.g_dbus_proxy_call(proxy, Converter.javaStringToCString(methodName), params, OS.G_DBUS_CALL_FLAGS_NO_AUTO_START, 1000, 0, callExtensionAsyncCallback.getAddress(), gerror); if (gerror[0] != 0) { - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); System.err.println("SWT webkit: There was an error executing something asynchronously with the extension."); System.err.println("SWT webkit: The error message is: " + msg); @@ -512,7 +512,7 @@ class WebkitGDBus { * * @param gVariant a pointer to the native GVariant */ - private static Object convertGVariantToJava(long /*int*/ gVariant){ + private static Object convertGVariantToJava(long gVariant){ if (OS.g_variant_is_of_type(gVariant, OS.G_VARIANT_TYPE_BOOLEAN)){ return new Boolean(OS.g_variant_get_boolean(gVariant)); @@ -567,7 +567,7 @@ class WebkitGDBus { * * @return pointer GVariant * */ - private static long /*int*/ convertJavaToGVariant(Object javaObject) throws SWTException { + private static long convertJavaToGVariant(Object javaObject) throws SWTException { if (javaObject == null) { return OS.g_variant_new_byte(WebkitGDBus.SWT_DBUS_MAGIC_NUMBER_NULL); // see: WebKitGTK.java 'TYPE NOTES' @@ -599,7 +599,7 @@ class WebkitGDBus { return OS.g_variant_new_byte(WebkitGDBus.SWT_DBUS_MAGIC_NUMBER_EMPTY_ARRAY); // see: WebKitGTK.java 'TYPE NOTES' } - long /*int*/ variants[] = new long /*int*/[length]; + long variants[] = new long /*int*/[length]; for (int i = 0; i < length; i++) { variants[i] = convertJavaToGVariant(arrayValue[i]); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java index 72f18a4681..a138b8eb5b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java @@ -19,35 +19,35 @@ public class JSClassDefinition { public int version; public int attributes; /** @field cast=(const char*) */ - public long /*int*/ className; + public long className; /** @field cast=(void*) */ - public long /*int*/ parentClass; + public long parentClass; /** @field cast=(const void*) */ - public long /*int*/ staticValues; + public long staticValues; /** @field cast=(const void*) */ - public long /*int*/ staticFunctions; + public long staticFunctions; /** @field cast=(void*) */ - public long /*int*/ initialize; + public long initialize; /** @field cast=(void*) */ - public long /*int*/ finalize; + public long finalize; /** @field cast=(void*) */ - public long /*int*/ hasProperty; + public long hasProperty; /** @field cast=(void*) */ - public long /*int*/ getProperty; + public long getProperty; /** @field cast=(void*) */ - public long /*int*/ setProperty; + public long setProperty; /** @field cast=(void*) */ - public long /*int*/ deleteProperty; + public long deleteProperty; /** @field cast=(void*) */ - public long /*int*/ getPropertyNames; + public long getPropertyNames; /** @field cast=(void*) */ - public long /*int*/ callAsFunction; + public long callAsFunction; /** @field cast=(void*) */ - public long /*int*/ callAsConstructor; + public long callAsConstructor; /** @field cast=(void*) */ - public long /*int*/ hasInstance; + public long hasInstance; /** @field cast=(void*) */ - public long /*int*/ convertToType; + public long convertToType; public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof(); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java index 893688b5e3..92a7ba78bf 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java @@ -243,8 +243,8 @@ public class WebKitGTK extends C { /** @method flags=dynamic */ -public static final native long /*int*/ _JSClassCreate (long /*int*/ definition); -public static final long /*int*/ JSClassCreate (long /*int*/ definition) { +public static final native long _JSClassCreate (long definition); +public static final long JSClassCreate (long definition) { lock.lock(); try { return _JSClassCreate (definition); @@ -254,8 +254,8 @@ public static final long /*int*/ JSClassCreate (long /*int*/ definition) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSContextGetGlobalObject (long /*int*/ ctx); -public static final long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx) { +public static final native long _JSContextGetGlobalObject (long ctx); +public static final long JSContextGetGlobalObject (long ctx) { lock.lock(); try { return _JSContextGetGlobalObject (ctx); @@ -265,8 +265,8 @@ public static final long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception); -public static final long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception) { +public static final native long _JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long /*int*/[] exception); +public static final long JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long /*int*/[] exception) { lock.lock(); try { return _JSEvaluateScript (ctx, script, thisObject, sourceURL, startingLineNumber, exception); @@ -276,8 +276,8 @@ public static final long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int* } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectGetPrivate (long /*int*/ object); -public static final long /*int*/ JSObjectGetPrivate (long /*int*/ object) { +public static final native long _JSObjectGetPrivate (long object); +public static final long JSObjectGetPrivate (long object) { lock.lock(); try { return _JSObjectGetPrivate (object); @@ -287,8 +287,8 @@ public static final long /*int*/ JSObjectGetPrivate (long /*int*/ object) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception); -public static final long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception) { +public static final native long _JSObjectGetProperty (long ctx, long object, long propertyName, long /*int*/[] exception); +public static final long JSObjectGetProperty (long ctx, long object, long propertyName, long /*int*/[] exception) { lock.lock(); try { return _JSObjectGetProperty (ctx, object, propertyName, exception); @@ -298,8 +298,8 @@ public static final long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*i } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception); -public static final long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception) { +public static final native long _JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long /*int*/[] exception); +public static final long JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long /*int*/[] exception) { lock.lock(); try { return _JSObjectGetPropertyAtIndex (ctx, object, propertyIndex, exception); @@ -309,8 +309,8 @@ public static final long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, l } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data); -public static final long /*int*/ JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data) { +public static final native long _JSObjectMake (long ctx, long jsClass, long data); +public static final long JSObjectMake (long ctx, long jsClass, long data) { lock.lock(); try { return _JSObjectMake (ctx, jsClass, data); @@ -320,8 +320,8 @@ public static final long /*int*/ JSObjectMake (long /*int*/ ctx, long /*int*/ js } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception); -public static final long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception) { +public static final native long _JSObjectMakeArray (long ctx, long argumentCount, long /*int*/[] arguments, long /*int*/[] exception); +public static final long JSObjectMakeArray (long ctx, long argumentCount, long /*int*/[] arguments, long /*int*/[] exception) { lock.lock(); try { return _JSObjectMakeArray (ctx, argumentCount, arguments, exception); @@ -331,8 +331,8 @@ public static final long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction); -public static final long /*int*/ JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction) { +public static final native long _JSObjectMakeFunctionWithCallback (long ctx, long name, long callAsFunction); +public static final long JSObjectMakeFunctionWithCallback (long ctx, long name, long callAsFunction) { lock.lock(); try { return _JSObjectMakeFunctionWithCallback (ctx, name, callAsFunction); @@ -342,8 +342,8 @@ public static final long /*int*/ JSObjectMakeFunctionWithCallback (long /*int*/ } /** @method flags=dynamic */ -public static final native void _JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception); -public static final void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception) { +public static final native void _JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long /*int*/[] exception); +public static final void JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long /*int*/[] exception) { lock.lock(); try { _JSObjectSetProperty (ctx, object, propertyName, value, attributes, exception); @@ -353,8 +353,8 @@ public static final void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ obj } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringCreateWithUTF8CString (byte[] string); -public static final long /*int*/ JSStringCreateWithUTF8CString (byte[] string) { +public static final native long _JSStringCreateWithUTF8CString (byte[] string); +public static final long JSStringCreateWithUTF8CString (byte[] string) { lock.lock(); try { return _JSStringCreateWithUTF8CString (string); @@ -364,8 +364,8 @@ public static final long /*int*/ JSStringCreateWithUTF8CString (byte[] string) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringGetLength (long /*int*/ string); -public static final long /*int*/ JSStringGetLength (long /*int*/ string) { +public static final native long _JSStringGetLength (long string); +public static final long JSStringGetLength (long string) { lock.lock(); try { return _JSStringGetLength (string); @@ -375,8 +375,8 @@ public static final long /*int*/ JSStringGetLength (long /*int*/ string) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringGetMaximumUTF8CStringSize (long /*int*/ string); -public static final long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string) { +public static final native long _JSStringGetMaximumUTF8CStringSize (long string); +public static final long JSStringGetMaximumUTF8CStringSize (long string) { lock.lock(); try { return _JSStringGetMaximumUTF8CStringSize (string); @@ -386,8 +386,8 @@ public static final long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize); -public static final long /*int*/ JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize) { +public static final native long _JSStringGetUTF8CString (long string, byte[] buffer, long bufferSize); +public static final long JSStringGetUTF8CString (long string, byte[] buffer, long bufferSize) { lock.lock(); try { return _JSStringGetUTF8CString (string, buffer, bufferSize); @@ -397,8 +397,8 @@ public static final long /*int*/ JSStringGetUTF8CString (long /*int*/ string, by } /** @method flags=dynamic */ -public static final native int _JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b); -public static final int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b) { +public static final native int _JSStringIsEqualToUTF8CString (long a, byte[] b); +public static final int JSStringIsEqualToUTF8CString (long a, byte[] b) { lock.lock(); try { return _JSStringIsEqualToUTF8CString (a, b); @@ -408,8 +408,8 @@ public static final int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b) } /** @method flags=dynamic */ -public static final native void _JSStringRelease (long /*int*/ string); -public static final void JSStringRelease (long /*int*/ string) { +public static final native void _JSStringRelease (long string); +public static final void JSStringRelease (long string) { lock.lock(); try { _JSStringRelease (string); @@ -421,8 +421,8 @@ public static final void JSStringRelease (long /*int*/ string) { // Signature: void webkit_javascript_result_unref (WebKitJavascriptResult *js_result); // Type Note: WebKitJavascriptResult -> gpointer -> jlong /** @method flags=dynamic */ -public static final native void _webkit_javascript_result_unref(long /*int*/ js_result); -public static final void webkit_javascript_result_unref(long /*int*/ js_result) { +public static final native void _webkit_javascript_result_unref(long js_result); +public static final void webkit_javascript_result_unref(long js_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -433,8 +433,8 @@ public static final void webkit_javascript_result_unref(long /*int*/ js_result) } /** @method flags=dynamic */ -public static final native int _JSValueGetType (long /*int*/ ctx, long /*int*/ value); -public static final int JSValueGetType (long /*int*/ ctx, long /*int*/ value) { +public static final native int _JSValueGetType (long ctx, long value); +public static final int JSValueGetType (long ctx, long value) { lock.lock(); try { return _JSValueGetType (ctx, value); @@ -444,8 +444,8 @@ public static final int JSValueGetType (long /*int*/ ctx, long /*int*/ value) { } /** @method flags=dynamic */ -public static final native int _JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass); -public static final int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass) { +public static final native int _JSValueIsObjectOfClass (long ctx, long value, long jsClass); +public static final int JSValueIsObjectOfClass (long ctx, long value, long jsClass) { lock.lock(); try { return _JSValueIsObjectOfClass (ctx, value, jsClass); @@ -455,8 +455,8 @@ public static final int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ v } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeBoolean (long /*int*/ ctx, int bool); -public static final long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, int bool) { +public static final native long _JSValueMakeBoolean (long ctx, int bool); +public static final long JSValueMakeBoolean (long ctx, int bool) { lock.lock(); try { return _JSValueMakeBoolean (ctx, bool); @@ -466,8 +466,8 @@ public static final long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, int bool) } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeNumber (long /*int*/ ctx, double number); -public static final long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number) { +public static final native long _JSValueMakeNumber (long ctx, double number); +public static final long JSValueMakeNumber (long ctx, double number) { lock.lock(); try { return _JSValueMakeNumber (ctx, number); @@ -477,8 +477,8 @@ public static final long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double num } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeString (long /*int*/ ctx, long /*int*/ string); -public static final long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string) { +public static final native long _JSValueMakeString (long ctx, long string); +public static final long JSValueMakeString (long ctx, long string) { lock.lock(); try { return _JSValueMakeString (ctx, string); @@ -488,8 +488,8 @@ public static final long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeUndefined (long /*int*/ ctx); -public static final long /*int*/ JSValueMakeUndefined (long /*int*/ ctx) { +public static final native long _JSValueMakeUndefined (long ctx); +public static final long JSValueMakeUndefined (long ctx) { lock.lock(); try { return _JSValueMakeUndefined (ctx); @@ -499,8 +499,8 @@ public static final long /*int*/ JSValueMakeUndefined (long /*int*/ ctx) { } /** @method flags=dynamic */ -public static final native double _JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); -public static final double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) { +public static final native double _JSValueToNumber (long ctx, long value, long /*int*/[] exception); +public static final double JSValueToNumber (long ctx, long value, long /*int*/[] exception) { lock.lock(); try { return _JSValueToNumber (ctx, value, exception); @@ -510,8 +510,8 @@ public static final double JSValueToNumber (long /*int*/ ctx, long /*int*/ value } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); -public static final long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) { +public static final native long _JSValueToStringCopy (long ctx, long value, long /*int*/[] exception); +public static final long JSValueToStringCopy (long ctx, long value, long /*int*/[] exception) { lock.lock(); try { return _JSValueToStringCopy (ctx, value, exception); @@ -523,8 +523,8 @@ public static final long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*i /* --------------------- start libsoup natives --------------------- */ /** @method flags=dynamic */ -public static final native void _soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password); -public static final void soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password) { +public static final native void _soup_auth_authenticate (long auth, byte[] username, byte[] password); +public static final void soup_auth_authenticate (long auth, byte[] username, byte[] password) { lock.lock(); try { _soup_auth_authenticate (auth, username, password); @@ -534,8 +534,8 @@ public static final void soup_auth_authenticate (long /*int*/ auth, byte[] usern } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_auth_get_host (long /*int*/ auth); -public static final long /*int*/ soup_auth_get_host (long /*int*/ auth) { +public static final native long _soup_auth_get_host (long auth); +public static final long soup_auth_get_host (long auth) { lock.lock(); try { return _soup_auth_get_host (auth); @@ -545,8 +545,8 @@ public static final long /*int*/ soup_auth_get_host (long /*int*/ auth) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_auth_get_scheme_name (long /*int*/ auth); -public static final long /*int*/ soup_auth_get_scheme_name (long /*int*/ auth) { +public static final native long _soup_auth_get_scheme_name (long auth); +public static final long soup_auth_get_scheme_name (long auth) { lock.lock(); try { return _soup_auth_get_scheme_name (auth); @@ -556,8 +556,8 @@ public static final long /*int*/ soup_auth_get_scheme_name (long /*int*/ auth) { } /** @method flags=dynamic */ -public static final native void _soup_cookie_free (long /*int*/ cookie); -public static final void soup_cookie_free (long /*int*/ cookie) { +public static final native void _soup_cookie_free (long cookie); +public static final void soup_cookie_free (long cookie) { lock.lock(); try { _soup_cookie_free (cookie); @@ -567,8 +567,8 @@ public static final void soup_cookie_free (long /*int*/ cookie) { } /** @method flags=dynamic */ -public static final native void _soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie); -public static final void soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie) { +public static final native void _soup_cookie_jar_add_cookie (long jar, long cookie); +public static final void soup_cookie_jar_add_cookie (long jar, long cookie) { lock.lock(); try { _soup_cookie_jar_add_cookie (jar, cookie); @@ -578,8 +578,8 @@ public static final void soup_cookie_jar_add_cookie (long /*int*/ jar, long /*in } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_jar_all_cookies (long /*int*/ jar); -public static final long /*int*/ soup_cookie_jar_all_cookies (long /*int*/ jar) { +public static final native long _soup_cookie_jar_all_cookies (long jar); +public static final long soup_cookie_jar_all_cookies (long jar) { lock.lock(); try { return _soup_cookie_jar_all_cookies (jar); @@ -589,8 +589,8 @@ public static final long /*int*/ soup_cookie_jar_all_cookies (long /*int*/ jar) } /** @method flags=dynamic */ -public static final native void _soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie); -public static final void soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie) { +public static final native void _soup_cookie_jar_delete_cookie (long jar, long cookie); +public static final void soup_cookie_jar_delete_cookie (long jar, long cookie) { lock.lock(); try { _soup_cookie_jar_delete_cookie (jar, cookie); @@ -600,8 +600,8 @@ public static final void soup_cookie_jar_delete_cookie (long /*int*/ jar, long / } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http); -public static final long /*int*/ soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http) { +public static final native long _soup_cookie_jar_get_cookies (long jar, long uri, int for_http); +public static final long soup_cookie_jar_get_cookies (long jar, long uri, int for_http) { lock.lock(); try { return _soup_cookie_jar_get_cookies (jar, uri, for_http); @@ -611,8 +611,8 @@ public static final long /*int*/ soup_cookie_jar_get_cookies (long /*int*/ jar, } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_jar_get_type (); -public static final long /*int*/ soup_cookie_jar_get_type () { +public static final native long _soup_cookie_jar_get_type (); +public static final long soup_cookie_jar_get_type () { lock.lock(); try { return _soup_cookie_jar_get_type (); @@ -622,8 +622,8 @@ public static final long /*int*/ soup_cookie_jar_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_parse (byte[] header, long /*int*/ origin); -public static final long /*int*/ soup_cookie_parse (byte[] header, long /*int*/ origin) { +public static final native long _soup_cookie_parse (byte[] header, long origin); +public static final long soup_cookie_parse (byte[] header, long origin) { lock.lock(); try { return _soup_cookie_parse (header, origin); @@ -633,8 +633,8 @@ public static final long /*int*/ soup_cookie_parse (byte[] header, long /*int*/ } /** @method flags=dynamic */ -public static final native void _soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length); -public static final void soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length) { +public static final native void _soup_message_body_append (long body, int use, long data, long length); +public static final void soup_message_body_append (long body, int use, long data, long length) { lock.lock(); try { _soup_message_body_append (body, use, data, length); @@ -644,8 +644,8 @@ public static final void soup_message_body_append (long /*int*/ body, int use, l } /** @method flags=dynamic */ -public static final native void _soup_message_body_flatten (long /*int*/ body); -public static final void soup_message_body_flatten (long /*int*/ body) { +public static final native void _soup_message_body_flatten (long body); +public static final void soup_message_body_flatten (long body) { lock.lock(); try { _soup_message_body_flatten (body); @@ -655,8 +655,8 @@ public static final void soup_message_body_flatten (long /*int*/ body) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_message_get_uri (long /*int*/ msg); -public static final long /*int*/ soup_message_get_uri (long /*int*/ msg) { +public static final native long _soup_message_get_uri (long msg); +public static final long soup_message_get_uri (long msg) { lock.lock(); try { return _soup_message_get_uri (msg); @@ -666,8 +666,8 @@ public static final long /*int*/ soup_message_get_uri (long /*int*/ msg) { } /** @method flags=dynamic */ -public static final native void _soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value); -public static final void soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value) { +public static final native void _soup_message_headers_append (long headers, byte[] name, byte[] value); +public static final void soup_message_headers_append (long headers, byte[] name, byte[] value) { lock.lock(); try { _soup_message_headers_append (headers, name, value); @@ -677,8 +677,8 @@ public static final void soup_message_headers_append (long /*int*/ headers, byte } /** @method flags=dynamic */ -public static final native void _soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type); -public static final void soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type) { +public static final native void _soup_session_add_feature_by_type (long session, long type); +public static final void soup_session_add_feature_by_type (long session, long type) { lock.lock(); try { _soup_session_add_feature_by_type (session, type); @@ -688,8 +688,8 @@ public static final void soup_session_add_feature_by_type (long /*int*/ session, } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type); -public static final long /*int*/ soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type) { +public static final native long _soup_session_get_feature (long session, long feature_type); +public static final long soup_session_get_feature (long session, long feature_type) { lock.lock(); try { return _soup_session_get_feature (session, feature_type); @@ -699,8 +699,8 @@ public static final long /*int*/ soup_session_get_feature (long /*int*/ session, } /** @method flags=dynamic */ -public static final native void _soup_session_feature_attach (long /*int*/ feature, long /*int*/ session); -public static final void soup_session_feature_attach (long /*int*/ feature, long /*int*/ session) { +public static final native void _soup_session_feature_attach (long feature, long session); +public static final void soup_session_feature_attach (long feature, long session) { lock.lock(); try { _soup_session_feature_attach (feature, session); @@ -710,8 +710,8 @@ public static final void soup_session_feature_attach (long /*int*/ feature, long } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_session_get_type (); -public static final long /*int*/ soup_session_get_type () { +public static final native long _soup_session_get_type (); +public static final long soup_session_get_type () { lock.lock(); try { return _soup_session_get_type (); @@ -721,8 +721,8 @@ public static final long /*int*/ soup_session_get_type () { } /** @method flags=dynamic */ -public static final native void _soup_session_feature_detach (long /*int*/ feature, long /*int*/ session); -public static final void soup_session_feature_detach (long /*int*/ feature, long /*int*/ session) { +public static final native void _soup_session_feature_detach (long feature, long session); +public static final void soup_session_feature_detach (long feature, long session) { lock.lock(); try { _soup_session_feature_detach (feature, session); @@ -732,8 +732,8 @@ public static final void soup_session_feature_detach (long /*int*/ feature, long } /** @method flags=dynamic */ -public static final native void _soup_uri_free (long /*int*/ uri); -public static final void soup_uri_free (long /*int*/ uri) { +public static final native void _soup_uri_free (long uri); +public static final void soup_uri_free (long uri) { lock.lock(); try { _soup_uri_free (uri); @@ -743,8 +743,8 @@ public static final void soup_uri_free (long /*int*/ uri) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_uri_new (byte[] uri_string); -public static final long /*int*/ soup_uri_new (byte[] uri_string) { +public static final native long _soup_uri_new (byte[] uri_string); +public static final long soup_uri_new (byte[] uri_string) { lock.lock(); try { return _soup_uri_new (uri_string); @@ -754,8 +754,8 @@ public static final long /*int*/ soup_uri_new (byte[] uri_string) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_uri_to_string (long /*int*/ uri, int just_path_and_query); -public static final long /*int*/ soup_uri_to_string (long /*int*/ uri, int just_path_and_query) { +public static final native long _soup_uri_to_string (long uri, int just_path_and_query); +public static final long soup_uri_to_string (long uri, int just_path_and_query) { lock.lock(); try { return _soup_uri_to_string (uri, just_path_and_query); @@ -767,8 +767,8 @@ public static final long /*int*/ soup_uri_to_string (long /*int*/ uri, int just_ /* --------------------- start WebKitGTK natives --------------------- */ /** @method flags=dynamic */ -public static final native void _webkit_authentication_request_authenticate (long /*int*/ request, long /*int*/ credential); -public static final void webkit_authentication_request_authenticate (long /*int*/ request, long /*int*/ credential) { +public static final native void _webkit_authentication_request_authenticate (long request, long credential); +public static final void webkit_authentication_request_authenticate (long request, long credential) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -779,8 +779,8 @@ public static final void webkit_authentication_request_authenticate (long /*int* } /** @method flags=dynamic */ -public static final native void _webkit_authentication_request_cancel (long /*int*/ request); -public static final void webkit_authentication_request_cancel (long /*int*/ request) { +public static final native void _webkit_authentication_request_cancel (long request); +public static final void webkit_authentication_request_cancel (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -791,8 +791,8 @@ public static final void webkit_authentication_request_cancel (long /*int*/ requ } /** @method flags=dynamic */ -public static final native boolean _webkit_authentication_request_is_retry (long /*int*/ request); -public static final boolean webkit_authentication_request_is_retry (long /*int*/ request) { +public static final native boolean _webkit_authentication_request_is_retry (long request); +public static final boolean webkit_authentication_request_is_retry (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -803,8 +803,8 @@ public static final boolean webkit_authentication_request_is_retry (long /*int*/ } /** @method flags=dynamic */ -public static final native void _webkit_credential_free (long /*int*/ credential); -public static final void webkit_credential_free (long /*int*/ credential) { +public static final native void _webkit_credential_free (long credential); +public static final void webkit_credential_free (long credential) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -815,8 +815,8 @@ public static final void webkit_credential_free (long /*int*/ credential) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_allow_tls_certificate_for_host(long /*int*/ webKitWebContext, long /*int*/ GTlsCertificate, byte[] constGCharHost); -public static final long /*int*/ webkit_web_context_allow_tls_certificate_for_host(long /*int*/ webKitWebContext, long /*int*/ GTlsCertificate, byte[] constGCharHost) { +public static final native long _webkit_web_context_allow_tls_certificate_for_host(long webKitWebContext, long GTlsCertificate, byte[] constGCharHost); +public static final long webkit_web_context_allow_tls_certificate_for_host(long webKitWebContext, long GTlsCertificate, byte[] constGCharHost) { assert WEBKIT2 : Webkit2AssertMsg; // since 2.6 lock.lock(); @@ -828,8 +828,8 @@ public static final long /*int*/ webkit_web_context_allow_tls_certificate_for_ho } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_get_type (); -public static final long /*int*/ webkit_web_context_get_type () { +public static final native long _webkit_web_context_get_type (); +public static final long webkit_web_context_get_type () { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -840,8 +840,8 @@ public static final long /*int*/ webkit_web_context_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_credential_new (byte[] username, byte[] password, int persistence); -public static final long /*int*/ webkit_credential_new (byte[] username, byte[] password, int persistence) { +public static final native long _webkit_credential_new (byte[] username, byte[] password, int persistence); +public static final long webkit_credential_new (byte[] username, byte[] password, int persistence) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -853,8 +853,8 @@ public static final long /*int*/ webkit_credential_new (byte[] username, byte[] /** @method flags=dynamic */ -public static final native int _webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData); -public static final int webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData) { +public static final native int _webkit_dom_event_target_add_event_listener (long target, byte[] name, long handler, int bubble, long userData); +public static final int webkit_dom_event_target_add_event_listener (long target, byte[] name, long handler, int bubble, long userData) { lock.lock(); try { return _webkit_dom_event_target_add_event_listener (target, name, handler, bubble, userData); @@ -864,8 +864,8 @@ public static final int webkit_dom_event_target_add_event_listener (long /*int*/ } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_alt_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_alt_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_alt_key (long self); +public static final int webkit_dom_mouse_event_get_alt_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_alt_key (self); @@ -875,8 +875,8 @@ public static final int webkit_dom_mouse_event_get_alt_key (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native short _webkit_dom_mouse_event_get_button (long /*int*/ self); -public static final short webkit_dom_mouse_event_get_button (long /*int*/ self) { +public static final native short _webkit_dom_mouse_event_get_button (long self); +public static final short webkit_dom_mouse_event_get_button (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_button (self); @@ -886,8 +886,8 @@ public static final short webkit_dom_mouse_event_get_button (long /*int*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_ctrl_key (long self); +public static final int webkit_dom_mouse_event_get_ctrl_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_ctrl_key (self); @@ -897,8 +897,8 @@ public static final int webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_meta_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_meta_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_meta_key (long self); +public static final int webkit_dom_mouse_event_get_meta_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_meta_key (self); @@ -908,8 +908,8 @@ public static final int webkit_dom_mouse_event_get_meta_key (long /*int*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_mouse_event_get_screen_x (long /*int*/ self); -public static final long webkit_dom_mouse_event_get_screen_x (long /*int*/ self) { +public static final native long _webkit_dom_mouse_event_get_screen_x (long self); +public static final long webkit_dom_mouse_event_get_screen_x (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_screen_x (self); @@ -919,8 +919,8 @@ public static final long webkit_dom_mouse_event_get_screen_x (long /*int*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_mouse_event_get_screen_y (long /*int*/ self); -public static final long webkit_dom_mouse_event_get_screen_y (long /*int*/ self) { +public static final native long _webkit_dom_mouse_event_get_screen_y (long self); +public static final long webkit_dom_mouse_event_get_screen_y (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_screen_y (self); @@ -930,8 +930,8 @@ public static final long webkit_dom_mouse_event_get_screen_y (long /*int*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_shift_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_shift_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_shift_key (long self); +public static final int webkit_dom_mouse_event_get_shift_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_shift_key (self); @@ -941,8 +941,8 @@ public static final int webkit_dom_mouse_event_get_shift_key (long /*int*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_char_code (long /*int*/ self); -public static final long webkit_dom_ui_event_get_char_code (long /*int*/ self) { +public static final native long _webkit_dom_ui_event_get_char_code (long self); +public static final long webkit_dom_ui_event_get_char_code (long self) { lock.lock(); try { return _webkit_dom_ui_event_get_char_code (self); @@ -952,8 +952,8 @@ public static final long webkit_dom_ui_event_get_char_code (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_detail (long /*int*/ self); -public static final long webkit_dom_ui_event_get_detail (long /*int*/ self) { +public static final native long _webkit_dom_ui_event_get_detail (long self); +public static final long webkit_dom_ui_event_get_detail (long self) { lock.lock(); try { return _webkit_dom_ui_event_get_detail (self); @@ -963,8 +963,8 @@ public static final long webkit_dom_ui_event_get_detail (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_key_code (long /*int*/ self); -public static final long webkit_dom_ui_event_get_key_code (long /*int*/ self) { +public static final native long _webkit_dom_ui_event_get_key_code (long self); +public static final long webkit_dom_ui_event_get_key_code (long self) { lock.lock(); try { return _webkit_dom_ui_event_get_key_code (self); @@ -974,8 +974,8 @@ public static final long webkit_dom_ui_event_get_key_code (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native void _webkit_download_cancel (long /*int*/ download); -public static final void webkit_download_cancel (long /*int*/ download) { +public static final native void _webkit_download_cancel (long download); +public static final void webkit_download_cancel (long download) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -986,8 +986,8 @@ public static final void webkit_download_cancel (long /*int*/ download) { } /** @method flags=dynamic */ -public static final native long _webkit_download_get_current_size (long /*int*/ download); -public static final long webkit_download_get_current_size (long /*int*/ download) { +public static final native long _webkit_download_get_current_size (long download); +public static final long webkit_download_get_current_size (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -998,8 +998,8 @@ public static final long webkit_download_get_current_size (long /*int*/ download } /** @method flags=dynamic */ -public static final native long _webkit_download_get_received_data_length (long /*int*/ download); -public static final long webkit_download_get_received_data_length (long /*int*/ download) { +public static final native long _webkit_download_get_received_data_length (long download); +public static final long webkit_download_get_received_data_length (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1010,8 +1010,8 @@ public static final long webkit_download_get_received_data_length (long /*int*/ } /** @method flags=dynamic */ -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) { +public static final native long _webkit_download_get_network_request (long download); +public static final long webkit_download_get_network_request (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1022,8 +1022,8 @@ public static final long /*int*/ webkit_download_get_network_request (long /*int } /** @method flags=dynamic */ -public static final native int _webkit_download_get_status (long /*int*/ download); -public static final int webkit_download_get_status (long /*int*/ download) { +public static final native int _webkit_download_get_status (long download); +public static final int webkit_download_get_status (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1034,8 +1034,8 @@ public static final int webkit_download_get_status (long /*int*/ download) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_suggested_filename (long /*int*/ download); -public static final long /*int*/ webkit_download_get_suggested_filename (long /*int*/ download) { +public static final native long _webkit_download_get_suggested_filename (long download); +public static final long webkit_download_get_suggested_filename (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1046,8 +1046,8 @@ public static final long /*int*/ webkit_download_get_suggested_filename (long /* } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_request (long /*int*/ download); -public static final long /*int*/ webkit_download_get_request (long /*int*/ download) { +public static final native long _webkit_download_get_request (long download); +public static final long webkit_download_get_request (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1058,8 +1058,8 @@ public static final long /*int*/ webkit_download_get_request (long /*int*/ downl } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_response (long /*int*/ download); -public static final long /*int*/ webkit_download_get_response (long /*int*/ download) { +public static final native long _webkit_download_get_response (long download); +public static final long webkit_download_get_response (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1070,8 +1070,8 @@ public static final long /*int*/ webkit_download_get_response (long /*int*/ down } /** @method flags=dynamic */ -public static final native long _webkit_download_get_total_size (long /*int*/ download); -public static final long webkit_download_get_total_size (long /*int*/ download) { +public static final native long _webkit_download_get_total_size (long download); +public static final long webkit_download_get_total_size (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1082,8 +1082,8 @@ public static final long webkit_download_get_total_size (long /*int*/ download) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_type (); -public static final long /*int*/ webkit_download_get_type () { +public static final native long _webkit_download_get_type (); +public static final long webkit_download_get_type () { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1094,8 +1094,8 @@ public static final long /*int*/ webkit_download_get_type () { } /** @method flags=dynamic */ -public static final native long _webkit_uri_response_get_content_length (long /*int*/ response); -public static final long webkit_uri_response_get_content_length (long /*int*/ response) { +public static final native long _webkit_uri_response_get_content_length (long response); +public static final long webkit_uri_response_get_content_length (long response) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1106,8 +1106,8 @@ public static final long webkit_uri_response_get_content_length (long /*int*/ re } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_uri (long /*int*/ download); -public static final long /*int*/ webkit_download_get_uri (long /*int*/ download) { +public static final native long _webkit_download_get_uri (long download); +public static final long webkit_download_get_uri (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1118,8 +1118,8 @@ public static final long /*int*/ webkit_download_get_uri (long /*int*/ download) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_web_view (long /*int*/ download); -public static final long /*int*/ webkit_download_get_web_view (long /*int*/ download) { +public static final native long _webkit_download_get_web_view (long download); +public static final long webkit_download_get_web_view (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1130,8 +1130,8 @@ public static final long /*int*/ webkit_download_get_web_view (long /*int*/ down } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_new (long /*int*/ request); -public static final long /*int*/ webkit_download_new (long /*int*/ request) { +public static final native long _webkit_download_new (long request); +public static final long webkit_download_new (long request) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1142,8 +1142,8 @@ public static final long /*int*/ webkit_download_new (long /*int*/ request) { } /** @method flags=dynamic */ -public static final native void _webkit_download_set_allow_overwrite (long /*int*/ download, boolean allowed); -public static final void webkit_download_set_allow_overwrite (long /*int*/ download, boolean allowed) { +public static final native void _webkit_download_set_allow_overwrite (long download, boolean allowed); +public static final void webkit_download_set_allow_overwrite (long download, boolean allowed) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1154,8 +1154,8 @@ public static final void webkit_download_set_allow_overwrite (long /*int*/ downl } /** @method flags=dynamic */ -public static final native void _webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri); -public static final void webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri) { +public static final native void _webkit_download_set_destination_uri (long download, byte[] destination_uri); +public static final void webkit_download_set_destination_uri (long download, byte[] destination_uri) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1166,8 +1166,8 @@ public static final void webkit_download_set_destination_uri (long /*int*/ downl } /** @method flags=dynamic */ -public static final native void _webkit_download_set_destination (long /*int*/ download, byte[] destination_uri); -public static final void webkit_download_set_destination (long /*int*/ download, byte[] destination_uri) { +public static final native void _webkit_download_set_destination (long download, byte[] destination_uri); +public static final void webkit_download_set_destination (long download, byte[] destination_uri) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1178,8 +1178,8 @@ public static final void webkit_download_set_destination (long /*int*/ download, } /** @method flags=dynamic */ -public static final native void _webkit_download_start (long /*int*/ download); -public static final void webkit_download_start (long /*int*/ download) { +public static final native void _webkit_download_start (long download); +public static final void webkit_download_start (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1190,8 +1190,8 @@ public static final void webkit_download_start (long /*int*/ download) { } /** @method flags=dynamic */ -public static final native void _webkit_favicon_database_set_path (long /*int*/ database, long /*int*/ path); -public static final void webkit_favicon_database_set_path (long /*int*/ database, long /*int*/ path) { +public static final native void _webkit_favicon_database_set_path (long database, long path); +public static final void webkit_favicon_database_set_path (long database, long path) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1202,8 +1202,8 @@ public static final void webkit_favicon_database_set_path (long /*int*/ database } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_get_default_session (); -public static final long /*int*/ webkit_get_default_session () { +public static final native long _webkit_get_default_session (); +public static final long webkit_get_default_session () { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1214,8 +1214,8 @@ public static final long /*int*/ webkit_get_default_session () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_get_favicon_database (); -public static final long /*int*/ webkit_get_favicon_database () { +public static final native long _webkit_get_favicon_database (); +public static final long webkit_get_favicon_database () { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1226,8 +1226,8 @@ public static final long /*int*/ webkit_get_favicon_database () { } /** @method flags=dynamic */ -public static final native boolean _webkit_hit_test_result_context_is_link (long /*int*/ hit_test_result); -public static final boolean webkit_hit_test_result_context_is_link (long /*int*/ hit_test_result) { +public static final native boolean _webkit_hit_test_result_context_is_link (long hit_test_result); +public static final boolean webkit_hit_test_result_context_is_link (long hit_test_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1238,8 +1238,8 @@ public static final boolean webkit_hit_test_result_context_is_link (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result); -public static final long /*int*/ webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result) { +public static final native long _webkit_hit_test_result_get_link_uri (long hit_test_result); +public static final long webkit_hit_test_result_get_link_uri (long hit_test_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1250,8 +1250,8 @@ public static final long /*int*/ webkit_hit_test_result_get_link_uri (long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result); -public static final long /*int*/ webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result) { +public static final native long _webkit_hit_test_result_get_link_title (long hit_test_result); +public static final long webkit_hit_test_result_get_link_title (long hit_test_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1334,8 +1334,8 @@ public static final int webkit_get_minor_version () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_navigation_policy_decision_get_request (long /*int*/ decision); -public static final long /*int*/ webkit_navigation_policy_decision_get_request (long /*int*/ decision) { +public static final native long _webkit_navigation_policy_decision_get_request (long decision); +public static final long webkit_navigation_policy_decision_get_request (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1346,8 +1346,8 @@ public static final long /*int*/ webkit_navigation_policy_decision_get_request ( } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_network_request_get_message (long /*int*/ request); -public static final long /*int*/ webkit_network_request_get_message (long /*int*/ request) { +public static final native long _webkit_network_request_get_message (long request); +public static final long webkit_network_request_get_message (long request) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1358,8 +1358,8 @@ public static final long /*int*/ webkit_network_request_get_message (long /*int* } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_network_request_get_uri (long /*int*/ request); -public static final long /*int*/ webkit_network_request_get_uri (long /*int*/ request) { +public static final native long _webkit_network_request_get_uri (long request); +public static final long webkit_network_request_get_uri (long request) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1370,8 +1370,8 @@ public static final long /*int*/ webkit_network_request_get_uri (long /*int*/ re } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_network_request_new (byte[] uri); -public static final long /*int*/ webkit_network_request_new (byte[] uri) { +public static final native long _webkit_network_request_new (byte[] uri); +public static final long webkit_network_request_new (byte[] uri) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1382,8 +1382,8 @@ public static final long /*int*/ webkit_network_request_new (byte[] uri) { } /** @method flags=dynamic */ -public static final native void _webkit_policy_decision_download (long /*int*/ decision); -public static final void webkit_policy_decision_download (long /*int*/ decision) { +public static final native void _webkit_policy_decision_download (long decision); +public static final void webkit_policy_decision_download (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1394,8 +1394,8 @@ public static final void webkit_policy_decision_download (long /*int*/ decision) } /** @method flags=dynamic */ -public static final native void _webkit_policy_decision_ignore (long /*int*/ decision); -public static final void webkit_policy_decision_ignore (long /*int*/ decision) { +public static final native void _webkit_policy_decision_ignore (long decision); +public static final void webkit_policy_decision_ignore (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1406,8 +1406,8 @@ public static final void webkit_policy_decision_ignore (long /*int*/ decision) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_soup_auth_dialog_get_type (); -public static final long /*int*/ webkit_soup_auth_dialog_get_type () { +public static final native long _webkit_soup_auth_dialog_get_type (); +public static final long webkit_soup_auth_dialog_get_type () { // Can't find reference for this. Currently used only by webkit1 thou, probably webkit1-only. assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); @@ -1419,8 +1419,8 @@ public static final long /*int*/ webkit_soup_auth_dialog_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_get_default (); -public static final long /*int*/ webkit_web_context_get_default () { +public static final native long _webkit_web_context_get_default (); +public static final long webkit_web_context_get_default () { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1431,8 +1431,8 @@ public static final long /*int*/ webkit_web_context_get_default () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_get_website_data_manager (long /*int*/ context); -public static final long /*int*/ webkit_web_context_get_website_data_manager (long /*int*/ context) { +public static final native long _webkit_web_context_get_website_data_manager (long context); +public static final long webkit_web_context_get_website_data_manager (long context) { assert WEBKIT2 : Webkit2AssertMsg; // Since 2.10 lock.lock(); try { @@ -1443,8 +1443,8 @@ try { } /** @method flags=dynamic */ -public static final native void _webkit_web_context_set_tls_errors_policy(long /*int*/ context, int policy); -public static final void webkit_web_context_set_tls_errors_policy (long /*int*/ context, int policy) { +public static final native void _webkit_web_context_set_tls_errors_policy(long context, int policy); +public static final void webkit_web_context_set_tls_errors_policy (long context, int policy) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1456,8 +1456,8 @@ public static final void webkit_web_context_set_tls_errors_policy (long /*int*/ /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_data_source_get_data (long /*int*/ data_source); -public static final long /*int*/ webkit_web_data_source_get_data (long /*int*/ data_source) { +public static final native long _webkit_web_data_source_get_data (long data_source); +public static final long webkit_web_data_source_get_data (long data_source) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1468,8 +1468,8 @@ public static final long /*int*/ webkit_web_data_source_get_data (long /*int*/ d } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_data_source_get_encoding (long /*int*/ data_source); -public static final long /*int*/ webkit_web_data_source_get_encoding (long /*int*/ data_source) { +public static final native long _webkit_web_data_source_get_encoding (long data_source); +public static final long webkit_web_data_source_get_encoding (long data_source) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1480,8 +1480,8 @@ public static final long /*int*/ webkit_web_data_source_get_encoding (long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_data_source (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_data_source (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_data_source (long frame); +public static final long webkit_web_frame_get_data_source (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1492,8 +1492,8 @@ public static final long /*int*/ webkit_web_frame_get_data_source (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_global_context (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_global_context (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_global_context (long frame); +public static final long webkit_web_frame_get_global_context (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1504,8 +1504,8 @@ public static final long /*int*/ webkit_web_frame_get_global_context (long /*int } /** @method flags=dynamic */ -public static final native int _webkit_web_frame_get_load_status (long /*int*/ frame); -public static final int webkit_web_frame_get_load_status (long /*int*/ frame) { +public static final native int _webkit_web_frame_get_load_status (long frame); +public static final int webkit_web_frame_get_load_status (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1516,8 +1516,8 @@ public static final int webkit_web_frame_get_load_status (long /*int*/ frame) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_parent (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_parent (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_parent (long frame); +public static final long webkit_web_frame_get_parent (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1528,8 +1528,8 @@ public static final long /*int*/ webkit_web_frame_get_parent (long /*int*/ frame } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_title (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_title (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_title (long frame); +public static final long webkit_web_frame_get_title (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1540,8 +1540,8 @@ public static final long /*int*/ webkit_web_frame_get_title (long /*int*/ frame) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_type (); -public static final long /*int*/ webkit_web_frame_get_type () { +public static final native long _webkit_web_frame_get_type (); +public static final long webkit_web_frame_get_type () { // Can't find reference. Probably a webkit1 macro. assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); @@ -1553,8 +1553,8 @@ public static final long /*int*/ webkit_web_frame_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_uri (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_uri (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_uri (long frame); +public static final long webkit_web_frame_get_uri (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1565,8 +1565,8 @@ public static final long /*int*/ webkit_web_frame_get_uri (long /*int*/ frame) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_web_view (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_web_view (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_web_view (long frame); +public static final long webkit_web_frame_get_web_view (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1577,8 +1577,8 @@ public static final long /*int*/ webkit_web_frame_get_web_view (long /*int*/ fra } /** @method flags=dynamic */ -public static final native void _webkit_web_policy_decision_download (long /*int*/ decision); -public static final void webkit_web_policy_decision_download (long /*int*/ decision) { +public static final native void _webkit_web_policy_decision_download (long decision); +public static final void webkit_web_policy_decision_download (long decision) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1589,8 +1589,8 @@ public static final void webkit_web_policy_decision_download (long /*int*/ decis } /** @method flags=dynamic */ -public static final native void _webkit_web_policy_decision_ignore (long /*int*/ decision); -public static final void webkit_web_policy_decision_ignore (long /*int*/ decision) { +public static final native void _webkit_web_policy_decision_ignore (long decision); +public static final void webkit_web_policy_decision_ignore (long decision) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1601,8 +1601,8 @@ public static final void webkit_web_policy_decision_ignore (long /*int*/ decisio } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_go_back (long /*int*/ web_view); -public static final int webkit_web_view_can_go_back (long /*int*/ web_view) { +public static final native int _webkit_web_view_can_go_back (long web_view); +public static final int webkit_web_view_can_go_back (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1613,8 +1613,8 @@ public static final int webkit_web_view_can_go_back (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_main_resource (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_main_resource (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_main_resource (long web_view); +public static final long webkit_web_view_get_main_resource (long web_view) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1625,8 +1625,8 @@ public static final long /*int*/ webkit_web_view_get_main_resource (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_context (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_context (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_context (long web_view); +public static final long webkit_web_view_get_context (long web_view) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1637,8 +1637,8 @@ public static final long /*int*/ webkit_web_view_get_context (long /*int*/ web_v } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_go_forward (long /*int*/ web_view); -public static final int webkit_web_view_can_go_forward (long /*int*/ web_view) { +public static final native int _webkit_web_view_can_go_forward (long web_view); +public static final int webkit_web_view_can_go_forward (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1649,8 +1649,8 @@ public static final int webkit_web_view_can_go_forward (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type); -public static final int webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type) { +public static final native int _webkit_web_view_can_show_mime_type (long web_view, long mime_type); +public static final int webkit_web_view_can_show_mime_type (long web_view, long mime_type) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1661,8 +1661,8 @@ public static final int webkit_web_view_can_show_mime_type (long /*int*/ web_vie } /** @method flags=dynamic */ -public static final native void _webkit_web_view_execute_script (long /*int*/ web_view, byte[] script); -public static final void webkit_web_view_execute_script (long /*int*/ web_view, byte[] script) { // never called +public static final native void _webkit_web_view_execute_script (long web_view, byte[] script); +public static final void webkit_web_view_execute_script (long web_view, byte[] script) { // never called assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1673,8 +1673,8 @@ public static final void webkit_web_view_execute_script (long /*int*/ web_view, } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_dom_document (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_dom_document (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_dom_document (long web_view); +public static final long webkit_web_view_get_dom_document (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; //TODO - guard from being called on webkit2 (webkit_web_view_get_dom_document) lock.lock(); @@ -1686,8 +1686,8 @@ public static final long /*int*/ webkit_web_view_get_dom_document (long /*int*/ } /** @method flags=dynamic */ -public static final native double /*int*/ _webkit_web_view_get_estimated_load_progress (long /*int*/ web_view); -public static final double /*int*/ webkit_web_view_get_estimated_load_progress (long /*int*/ web_view) { +public static final native double _webkit_web_view_get_estimated_load_progress (long web_view); +public static final double webkit_web_view_get_estimated_load_progress (long web_view) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1698,8 +1698,8 @@ public static final double /*int*/ webkit_web_view_get_estimated_load_progress ( } /** @method flags=dynamic */ -public static final native int _webkit_web_view_get_load_status (long /*int*/ web_view); -public static final int webkit_web_view_get_load_status (long /*int*/ web_view) { +public static final native int _webkit_web_view_get_load_status (long web_view); +public static final int webkit_web_view_get_load_status (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1710,8 +1710,8 @@ public static final int webkit_web_view_get_load_status (long /*int*/ web_view) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_main_frame (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_main_frame (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_main_frame (long web_view); +public static final long webkit_web_view_get_main_frame (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1722,8 +1722,8 @@ public static final long /*int*/ webkit_web_view_get_main_frame (long /*int*/ we } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_page_id (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_page_id (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_page_id (long web_view); +public static final long webkit_web_view_get_page_id (long web_view) { lock.lock(); try { return _webkit_web_view_get_page_id (web_view); @@ -1733,8 +1733,8 @@ public static final long /*int*/ webkit_web_view_get_page_id (long /*int*/ web_v } /** @method flags=dynamic */ -public static final native double _webkit_web_view_get_progress (long /*int*/ web_view); -public static final double webkit_web_view_get_progress (long /*int*/ web_view) { +public static final native double _webkit_web_view_get_progress (long web_view); +public static final double webkit_web_view_get_progress (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1745,8 +1745,8 @@ public static final double webkit_web_view_get_progress (long /*int*/ web_view) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_settings (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_settings (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_settings (long web_view); +public static final long webkit_web_view_get_settings (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1757,8 +1757,8 @@ public static final long /*int*/ webkit_web_view_get_settings (long /*int*/ web_ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_title (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_title (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_title (long web_view); +public static final long webkit_web_view_get_title (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1769,8 +1769,8 @@ public static final long /*int*/ webkit_web_view_get_title (long /*int*/ web_vie } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_type (); -public static final long /*int*/ webkit_web_view_get_type () { +public static final native long _webkit_web_view_get_type (); +public static final long webkit_web_view_get_type () { // TODO Bug 514859 Investigate if this is a webkit1 only function or if it can be used on webkit2 also. // can't find reference for it. Could be a macro. lock.lock(); @@ -1782,8 +1782,8 @@ public static final long /*int*/ webkit_web_view_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_uri (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_uri (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_uri (long web_view); +public static final long webkit_web_view_get_uri (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1794,8 +1794,8 @@ public static final long /*int*/ webkit_web_view_get_uri (long /*int*/ web_view) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_window_features (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_window_features (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_window_features (long web_view); +public static final long webkit_web_view_get_window_features (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1806,9 +1806,9 @@ public static final long /*int*/ webkit_web_view_get_window_features (long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_window_properties (long /*int*/ webView); +public static final native long _webkit_web_view_get_window_properties (long webView); /** WebKitWindowProperties * webkit_web_view_get_window_properties (WebKitWebView *web_view); */ -public static final long /*int*/ webkit_web_view_get_window_properties (long /*int*/ webView) { +public static final long webkit_web_view_get_window_properties (long webView) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1822,8 +1822,8 @@ public static final long /*int*/ webkit_web_view_get_window_properties (long /*i * @method flags=dynamic * @param rectangle cast=(GdkRectangle *),flags=no_in */ -public static final native void _webkit_window_properties_get_geometry (long /*int*/ webKitWindowProperties, GdkRectangle rectangle); -public static final void webkit_window_properties_get_geometry (long /*int*/ webKitWindowProperties, GdkRectangle rectangle ) { +public static final native void _webkit_window_properties_get_geometry (long webKitWindowProperties, GdkRectangle rectangle); +public static final void webkit_window_properties_get_geometry (long webKitWindowProperties, GdkRectangle rectangle ) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1836,8 +1836,8 @@ public static final void webkit_window_properties_get_geometry (long /*int*/ web /** @method flags=dynamic */ -public static final native void _webkit_web_view_go_back (long /*int*/ web_view); -public static final void webkit_web_view_go_back (long /*int*/ web_view) { +public static final native void _webkit_web_view_go_back (long web_view); +public static final void webkit_web_view_go_back (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1848,8 +1848,8 @@ public static final void webkit_web_view_go_back (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_go_forward (long /*int*/ web_view); -public static final void webkit_web_view_go_forward (long /*int*/ web_view) { +public static final native void _webkit_web_view_go_forward (long web_view); +public static final void webkit_web_view_go_forward (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1860,8 +1860,8 @@ public static final void webkit_web_view_go_forward (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_html (long /*int*/ web_view, byte[] content, byte[] base_uri); -public static final void webkit_web_view_load_html (long /*int*/ web_view, byte[] content, byte[] base_uri) { +public static final native void _webkit_web_view_load_html (long web_view, byte[] content, byte[] base_uri); +public static final void webkit_web_view_load_html (long web_view, byte[] content, byte[] base_uri) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1872,8 +1872,8 @@ public static final void webkit_web_view_load_html (long /*int*/ web_view, byte[ } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_bytes (long /*int*/ web_view, long /*int*/ bytes, byte [] mime_type, byte [] encoding, byte [] base_uri); -public static final void webkit_web_view_load_bytes (long /*int*/ web_view, long /*int*/ bytes, byte [] mime_type, byte [] encoding, byte [] base_uri) { +public static final native void _webkit_web_view_load_bytes (long web_view, long bytes, byte [] mime_type, byte [] encoding, byte [] base_uri); +public static final void webkit_web_view_load_bytes (long web_view, long bytes, byte [] mime_type, byte [] encoding, byte [] base_uri) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1884,8 +1884,8 @@ public static final void webkit_web_view_load_bytes (long /*int*/ web_view, long } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri); -public static final void webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) { +public static final native void _webkit_web_view_load_string (long web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri); +public static final void webkit_web_view_load_string (long web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1896,8 +1896,8 @@ public static final void webkit_web_view_load_string (long /*int*/ web_view, byt } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_request (long /*int*/ web_view, long /*int*/ request); -public static final void webkit_web_view_load_request (long /*int*/ web_view, long /*int*/ request) { +public static final native void _webkit_web_view_load_request (long web_view, long request); +public static final void webkit_web_view_load_request (long web_view, long request) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1908,8 +1908,8 @@ public static final void webkit_web_view_load_request (long /*int*/ web_view, lo } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri); -public static final void webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri) { +public static final native void _webkit_web_view_load_uri (long web_view, byte[] uri); +public static final void webkit_web_view_load_uri (long web_view, byte[] uri) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1920,8 +1920,8 @@ public static final void webkit_web_view_load_uri (long /*int*/ web_view, byte[] } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_new (); -public static final long /*int*/ webkit_web_view_new () { +public static final native long _webkit_web_view_new (); +public static final long webkit_web_view_new () { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1933,8 +1933,8 @@ public static final long /*int*/ webkit_web_view_new () { /** @method flags=dynamic */ // @param context cast=(WebKitWebContext*) @param directory cast=(const gchar *) -public static final native void _webkit_web_context_set_web_extensions_directory (long /*int*/ context, byte[] directory); -public static final void webkit_web_context_set_web_extensions_directory (long /*int*/ context, byte[] directory) { +public static final native void _webkit_web_context_set_web_extensions_directory (long context, byte[] directory); +public static final void webkit_web_context_set_web_extensions_directory (long context, byte[] directory) { assert WEBKIT2; lock.lock(); try { @@ -1962,9 +1962,9 @@ public static final void webkit_web_context_set_web_extensions_initialization_us * @method flags=dynamic * @param js_result cast=(gpointer) */ -public static final native long /*int*/ _webkit_javascript_result_get_global_context(long /*int*/ js_result); +public static final native long _webkit_javascript_result_get_global_context(long js_result); /** JSGlobalContextRef webkit_javascript_result_get_global_context (WebKitJavascriptResult *js_result); */ -public static final long /*int*/ webkit_javascript_result_get_global_context(long /*int*/ js_result) { +public static final long webkit_javascript_result_get_global_context(long js_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1978,9 +1978,9 @@ public static final long /*int*/ webkit_javascript_result_get_global_context(lon * @method flags=dynamic * @param js_result cast=(gpointer) */ -public static final native long /*int*/ _webkit_javascript_result_get_value(long /*int*/ js_result); +public static final native long _webkit_javascript_result_get_value(long js_result); /** JSValueRef webkit_javascript_result_get_value (WebKitJavascriptResult *js_result); */ -public static final long /*int*/ webkit_javascript_result_get_value(long /*int*/ js_result) { +public static final long webkit_javascript_result_get_value(long js_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1991,8 +1991,8 @@ public static final long /*int*/ webkit_javascript_result_get_value(long /*int*/ } /** @method flags=dynamic */ -public static final native void _webkit_web_view_reload (long /*int*/ web_view); -public static final void webkit_web_view_reload (long /*int*/ web_view) { +public static final native void _webkit_web_view_reload (long web_view); +public static final void webkit_web_view_reload (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -2004,9 +2004,9 @@ public static final void webkit_web_view_reload (long /*int*/ web_view) { /** @method flags=dynamic */ -public static final native void _webkit_web_view_run_javascript (long /*int*/ web_view, byte [] script, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data); +public static final native void _webkit_web_view_run_javascript (long web_view, byte [] script, long cancellable, long callback, long user_data); /** void webkit_web_view_run_javascript (WebKitWebView *web_view, const gchar *script, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); **/ -public static final void webkit_web_view_run_javascript (long /*int*/ web_view, byte[] script, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data) { +public static final void webkit_web_view_run_javascript (long web_view, byte[] script, long cancellable, long callback, long user_data) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2017,8 +2017,8 @@ public static final void webkit_web_view_run_javascript (long /*int*/ web_view, } /** @method flags=dynamic */ -public static final native void _webkit_web_resource_get_data (long /*int*/ webKitWebResource, long /*int*/ gCancellable, long /*int*/ GAsyncReadyCallback, long /*int*/ user_data); -public static final void webkit_web_resource_get_data (long /*int*/ webKitWebResource, long /*int*/ gCancellable, long /*int*/ GAsyncReadyCallback, long /*int*/ user_data) { +public static final native void _webkit_web_resource_get_data (long webKitWebResource, long gCancellable, long GAsyncReadyCallback, long user_data); +public static final void webkit_web_resource_get_data (long webKitWebResource, long gCancellable, long GAsyncReadyCallback, long user_data) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -2029,8 +2029,8 @@ public static final void webkit_web_resource_get_data (long /*int*/ webKitWebRes } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_resource_get_data_finish(long /*int*/ WebKitWebResource, long /*int*/ GAsyncResult, long /*int*/[] gsize, long /*int*/ GError[]); -public static final long /*int*/ webkit_web_resource_get_data_finish(long /*int*/ WebKitWebResource, long /*int*/ GAsyncResult, long /*int*/[] gsize, long /*int*/ GError[]) { +public static final native long _webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long /*int*/[] gsize, long GError[]); +public static final long webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long /*int*/[] gsize, long GError[]) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2045,9 +2045,9 @@ public static final long /*int*/ webkit_web_resource_get_data_finish(long /*int* * @method flags=dynamic * @param gerror cast=(GError **) */ -public static final native long /*int*/ _webkit_web_view_run_javascript_finish(long /*int*/ web_view, long /*int*/ GAsyncResult, long /*int*/[] gerror); +public static final native long _webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long /*int*/[] gerror); /**WebKitJavascriptResult * webkit_web_view_run_javascript_finish (WebKitWebView *web_view, GAsyncResult *result, GError **error);*/ -public static long /*int*/ webkit_web_view_run_javascript_finish(long /*int*/ web_view, long /*int*/ GAsyncResult, long /*int*/[] gerror) { +public static long webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long /*int*/[] gerror) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2058,8 +2058,8 @@ public static long /*int*/ webkit_web_view_run_javascript_finish(long /*int*/ we } /** @method flags=dynamic */ -public static final native void _webkit_web_view_stop_loading (long /*int*/ web_view); -public static final void webkit_web_view_stop_loading (long /*int*/ web_view) { +public static final native void _webkit_web_view_stop_loading (long web_view); +public static final void webkit_web_view_stop_loading (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -2070,8 +2070,8 @@ public static final void webkit_web_view_stop_loading (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_website_data_manager_clear (long /*int*/ manager, long /*int*/ types, long /*int*/ timespan, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data); -public static final void webkit_website_data_manager_clear (long /*int*/ manager, long /*int*/ types, long /*int*/ timespan, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data) { +public static final native void _webkit_website_data_manager_clear (long manager, long types, long timespan, long cancellable, long callback, long user_data); +public static final void webkit_website_data_manager_clear (long manager, long types, long timespan, long cancellable, long callback, long user_data) { assert WEBKIT2 : Webkit2AssertMsg; // Since 2.16 lock.lock(); try { @@ -2082,8 +2082,8 @@ public static final void webkit_website_data_manager_clear (long /*int*/ manager } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_response_policy_decision_get_request (long /*int*/ decision); -public static final long /*int*/ webkit_response_policy_decision_get_request (long /*int*/ decision) { // never called +public static final native long _webkit_response_policy_decision_get_request (long decision); +public static final long webkit_response_policy_decision_get_request (long decision) { // never called assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2094,8 +2094,8 @@ public static final long /*int*/ webkit_response_policy_decision_get_request (l } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_response_policy_decision_get_response (long /*int*/ decision); -public static final long /*int*/ webkit_response_policy_decision_get_response (long /*int*/ decision) { +public static final native long _webkit_response_policy_decision_get_response (long decision); +public static final long webkit_response_policy_decision_get_response (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2106,8 +2106,8 @@ public static final long /*int*/ webkit_response_policy_decision_get_response ( } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_request_new (byte[] uri); -public static final long /*int*/ webkit_uri_request_new (byte[] uri) { +public static final native long _webkit_uri_request_new (byte[] uri); +public static final long webkit_uri_request_new (byte[] uri) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2118,8 +2118,8 @@ public static final long /*int*/ webkit_uri_request_new (byte[] uri) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_request_get_http_headers (long /*int*/ request); -public static final long /*int*/ webkit_uri_request_get_http_headers (long /*int*/ request) { +public static final native long _webkit_uri_request_get_http_headers (long request); +public static final long webkit_uri_request_get_http_headers (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2130,8 +2130,8 @@ public static final long /*int*/ webkit_uri_request_get_http_headers (long /*in } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_request_get_uri (long /*int*/ request); -public static final long /*int*/ webkit_uri_request_get_uri (long /*int*/ request) { +public static final native long _webkit_uri_request_get_uri (long request); +public static final long webkit_uri_request_get_uri (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2142,8 +2142,8 @@ public static final long /*int*/ webkit_uri_request_get_uri (long /*int*/ reque } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_response_get_mime_type (long /*int*/ responce); -public static final long /*int*/ webkit_uri_response_get_mime_type (long /*int*/ response) { +public static final native long _webkit_uri_response_get_mime_type (long responce); +public static final long webkit_uri_response_get_mime_type (long response) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2163,14 +2163,14 @@ public static final native int GdkRectangle_sizeof(); * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size); +public static final native void memmove (long dest, JSClassDefinition src, long size); /** * @method flags=getter * @param cookie cast=(SoupCookie *) */ -public static final native long /*int*/ _SoupCookie_expires (long /*int*/ cookie); -public static final long /*int*/ SoupCookie_expires (long /*int*/ cookie) { +public static final native long _SoupCookie_expires (long cookie); +public static final long SoupCookie_expires (long cookie) { lock.lock(); try { return _SoupCookie_expires (cookie); @@ -2184,8 +2184,8 @@ public static final long /*int*/ SoupCookie_expires (long /*int*/ cookie) { * @param message cast=(SoupMessage *) * @param method cast=(const char *) */ -public static final native void _SoupMessage_method (long /*int*/ message, long /*int*/ method); -public static final void SoupMessage_method (long /*int*/ message, long /*int*/ method) { +public static final native void _SoupMessage_method (long message, long method); +public static final void SoupMessage_method (long message, long method) { lock.lock(); try { _SoupMessage_method (message, method); @@ -2198,8 +2198,8 @@ public static final void SoupMessage_method (long /*int*/ message, long /*int*/ * @method flags=getter * @param message cast=(SoupMessage *) */ -public static final native long /*int*/ _SoupMessage_request_body (long /*int*/ message); -public static final long /*int*/ SoupMessage_request_body (long /*int*/ message) { +public static final native long _SoupMessage_request_body (long message); +public static final long SoupMessage_request_body (long message) { lock.lock(); try { return _SoupMessage_request_body (message); @@ -2212,8 +2212,8 @@ public static final long /*int*/ SoupMessage_request_body (long /*int*/ message) * @method flags=getter * @param message cast=(SoupMessage *) */ -public static final native long /*int*/ _SoupMessage_request_headers (long /*int*/ message); -public static final long /*int*/ SoupMessage_request_headers (long /*int*/ message) { +public static final native long _SoupMessage_request_headers (long message); +public static final long SoupMessage_request_headers (long message) { lock.lock(); try { return _SoupMessage_request_headers (message); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java index b0c83aab17..376aeda330 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java @@ -52,7 +52,7 @@ public class Path extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; boolean moved, closed = true; @@ -83,7 +83,7 @@ public class Path extends Resource { */ public Path (Device device) { super(device); - long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); + long surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); handle = Cairo.cairo_create(surface); Cairo.cairo_surface_destroy(surface); @@ -129,12 +129,12 @@ public Path (Device device, Path path, float flatness) { super(device); if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); + long surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); handle = Cairo.cairo_create(surface); Cairo.cairo_surface_destroy(surface); if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ copy; + long copy; flatness = Math.max(0, flatness); if (flatness == 0) { copy = Cairo.cairo_copy_path(path.handle); @@ -270,7 +270,7 @@ public void addPath(Path path) { if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); moved = false; - long /*int*/ copy = Cairo.cairo_copy_path(path.handle); + long copy = Cairo.cairo_copy_path(path.handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_append_path(handle, copy); Cairo.cairo_path_destroy(copy); @@ -392,8 +392,8 @@ boolean containsInPixels(float x, float y, GC gc, boolean outline) { gc.initCairo(); gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH); boolean result = false; - long /*int*/ cairo = gc.data.cairo; - long /*int*/ copy = Cairo.cairo_copy_path(handle); + long cairo = gc.data.cairo; + long copy = Cairo.cairo_copy_path(handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_append_path(cairo, copy); Cairo.cairo_path_destroy(copy); @@ -466,7 +466,7 @@ public void getBounds(float[] bounds) { } } void getBoundsInPixels(float[] bounds) { - long /*int*/ copy = Cairo.cairo_copy_path(handle); + long copy = Cairo.cairo_copy_path(handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); cairo_path_t path = new cairo_path_t(); Cairo.memmove(path, copy, cairo_path_t.sizeof); @@ -478,7 +478,7 @@ void getBoundsInPixels(float[] bounds) { double[] points = new double[6]; cairo_path_data_t data = new cairo_path_data_t(); while (i < path.num_data) { - long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof; + long offset = path.data + i * cairo_path_data_t.sizeof; Cairo.memmove(data, offset, cairo_path_data_t.sizeof); switch (data.type) { case Cairo.CAIRO_PATH_MOVE_TO: @@ -572,7 +572,7 @@ public PathData getPathData() { } PathData getPathDataInPixels() { - long /*int*/ copy = Cairo.cairo_copy_path(handle); + long copy = Cairo.cairo_copy_path(handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); cairo_path_t path = new cairo_path_t(); Cairo.memmove(path, copy, cairo_path_t.sizeof); @@ -584,7 +584,7 @@ PathData getPathDataInPixels() { double[] points = new double[6]; cairo_path_data_t data = new cairo_path_data_t(); while (i < path.num_data) { - long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof; + long offset = path.data + i * cairo_path_data_t.sizeof; Cairo.memmove(data, offset, cairo_path_data_t.sizeof); switch (data.type) { case Cairo.CAIRO_PATH_MOVE_TO: diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java index d2c4226565..91a1588844 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java @@ -50,9 +50,9 @@ public class Pattern extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; - long /*int*/ surface; + long surface; /** * Constructs a new Pattern given an image. Drawing with the resulting diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java index 1ffa3fc3c2..2248861bae 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java @@ -35,7 +35,7 @@ public class Callback { Object object; String method, signature; int argCount; - long /*int*/ address, errorResult; + long address, errorResult; boolean isStatic, isArrayBased; static final boolean is32Bit = C.PTR_SIZEOF == 4 ? true : false; @@ -108,7 +108,7 @@ public Callback (Object object, String method, int argCount, boolean isArrayBase * @param isArrayBased true if the arguments should be passed in an array and false otherwise * @param errorResult the return value if the java code throws an exception */ -public Callback (Object object, String method, int argCount, boolean isArrayBased, long /*int*/ errorResult) { +public Callback (Object object, String method, int argCount, boolean isArrayBased, long errorResult) { /* Set the callback fields */ this.object = object; @@ -248,7 +248,7 @@ public Callback (Object object, String method, Type returnType, Type [] argument * @param isArrayBased whether the callback's method is array based * @param errorResult the callback's error result */ -static native synchronized long /*int*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, long /*int*/ errorResult); +static native synchronized long bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, long errorResult); /** * Releases the native level resources associated with the callback, @@ -269,7 +269,7 @@ public void dispose () { * * @return the callback address */ -public long /*int*/ getAddress () { +public long getAddress () { return address; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java index f47864193b..7948528a71 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java @@ -25,7 +25,7 @@ import org.eclipse.swt.graphics.*; * @since 3.0 */ public final class Monitor { - long /*int*/ handle; + long handle; int x, y, width, height; int clientX, clientY, clientWidth, clientHeight; int zoom; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java index 21b945e854..d74cf171ce 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java @@ -41,7 +41,7 @@ import org.eclipse.swt.graphics.*; * @since 3.7 */ public final class TouchSource { - long /*int*/ handle; + long handle; boolean direct; Rectangle bounds; @@ -52,7 +52,7 @@ public final class TouchSource { * @param height height of the source in points. * @param width width of the source in points. */ -TouchSource (long /*int*/ handle, boolean direct, Rectangle bounds) { +TouchSource (long handle, boolean direct, Rectangle bounds) { this.handle = handle; this.direct = direct; this.bounds = bounds; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java index d0b02ffd11..629c90038b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java @@ -46,7 +46,7 @@ public class BidiUtil { /* * Not implemented. */ -public static void addLanguageListener(long /*int*/ hwnd, Runnable runnable) { +public static void addLanguageListener(long hwnd, Runnable runnable) { } public static void addLanguageListener (Control control, Runnable runnable) { } @@ -97,7 +97,7 @@ public static int getKeyboardLanguage() { /* * Not implemented. */ -public static void removeLanguageListener(long /*int*/ hwnd) { +public static void removeLanguageListener(long hwnd) { } public static void removeLanguageListener (Control control) { } @@ -115,7 +115,7 @@ public static void setKeyboardLanguage(int language) { /* * Not implemented. */ -public static boolean setOrientation(long /*int*/ hwnd, int orientation) { +public static boolean setOrientation(long hwnd, int orientation) { return false; } public static boolean setOrientation (Control control, int orientation) { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java index 5c20e7d7e1..d29e5beb3c 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java @@ -58,7 +58,7 @@ public final class Cursor extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; static final byte[] APPSTARTING_SRC = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, @@ -343,15 +343,15 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) { hotspotY >= source.height || hotspotY < 0) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - long /*int*/ display = 0; + long display = 0; if (GDK.gdk_display_supports_cursor_color(display = GDK.gdk_display_get_default ())) { int width = source.width; int height = source.height; PaletteData palette = source.palette; - long /*int*/ pixbuf = GDK.gdk_pixbuf_new(GDK.GDK_COLORSPACE_RGB, true, 8, width, height); + long pixbuf = GDK.gdk_pixbuf_new(GDK.GDK_COLORSPACE_RGB, true, 8, width, height); if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); int stride = GDK.gdk_pixbuf_get_rowstride(pixbuf); - long /*int*/ data = GDK.gdk_pixbuf_get_pixels(pixbuf); + long data = GDK.gdk_pixbuf_get_pixels(pixbuf); byte[] buffer = source.data; if (!palette.isDirect || source.depth != 24 || stride != source.bytesPerLine || palette.redMask != 0xFF000000 || palette.greenMask != 0xFF0000 || palette.blueMask != 0xFF00) { buffer = new byte[source.width * source.height * 4]; @@ -489,7 +489,7 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) { init(); } -long /*int*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) { +long createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) { for (int i = 0; i < sourceData.length; i++) { byte s = sourceData[i]; sourceData[i] = (byte)(((s & 0x80) >> 7) | @@ -538,14 +538,14 @@ long /*int*/ createCursor(byte[] sourceData, byte[] maskData, int width, int hei offset += 4; } } - long /*int*/ pixbuf = GDK.gdk_pixbuf_new(GDK.GDK_COLORSPACE_RGB, true, 8, width, height); + long pixbuf = GDK.gdk_pixbuf_new(GDK.GDK_COLORSPACE_RGB, true, 8, width, height); if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); int stride = GDK.gdk_pixbuf_get_rowstride(pixbuf); - long /*int*/ pixels = GDK.gdk_pixbuf_get_pixels(pixbuf); + long pixels = GDK.gdk_pixbuf_get_pixels(pixbuf); C.memmove(pixels, data, stride * height); - long /*int*/ cursor; + long cursor; if (GTK.GTK4) { - long /*int*/ texture = GDK.gdk_texture_new_for_pixbuf (pixbuf); + long texture = GDK.gdk_texture_new_for_pixbuf (pixbuf); cursor = GDK.gdk_cursor_new_from_texture (texture, hotspotX, hotspotY, 0); } else { cursor = GDK.gdk_cursor_new_from_pixbuf(GDK.gdk_display_get_default(), pixbuf, hotspotX, hotspotY); @@ -593,7 +593,7 @@ public boolean equals(Object object) { * * @noreference This method is not intended to be referenced by clients. */ -public static Cursor gtk_new(Device device, long /*int*/ handle) { +public static Cursor gtk_new(Device device, long handle) { Cursor cursor = new Cursor(device); cursor.handle = handle; return cursor; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java index 1fd2484fc3..6e5e6e453d 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java @@ -38,10 +38,10 @@ public abstract class Device implements Drawable { */ protected static final int CHANGE_SCALEFACTOR = 1; /* Settings callbacks */ - long /*int*/ gsettingsProc; + long gsettingsProc; Callback gsettingsCallback; boolean isConnected = false; - long /*int*/ displaySettings; //gsettings Dictionary + long displaySettings; //gsettings Dictionary /** * the handle to the X Display @@ -55,8 +55,8 @@ public abstract class Device implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - protected long /*int*/ xDisplay; - long /*int*/ shellHandle; + protected long xDisplay; + long shellHandle; /* Debugging */ public static boolean DEBUG; @@ -70,7 +70,7 @@ public abstract class Device implements Drawable { boolean disposed; /* Warning and Error Handlers */ - long /*int*/ logProc; + long logProc; Callback logCallback; //NOT DONE - get list of valid names String [] log_domains = {"", "GLib-GObject", "GLib", "GObject", "Pango", "ATK", "GdkPixbuf", "Gdk", "Gtk", "GnomeVFS", "GIO"}; @@ -79,7 +79,7 @@ public abstract class Device implements Drawable { /* X Warning and Error Handlers */ static Callback XErrorCallback, XIOErrorCallback; - static long /*int*/ XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc; + static long XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc; static Device[] Devices = new Device[4]; /* @@ -104,7 +104,7 @@ public abstract class Device implements Drawable { */ protected int scaleFactor; - long /*int*/ emptyTab; + long emptyTab; /* * TEMPORARY CODE. When a graphics object is @@ -260,7 +260,7 @@ void dispose_Object (Object object) { } } -static synchronized Device findDevice (long /*int*/ xDisplay) { +static synchronized Device findDevice (long xDisplay) { for (int i=0; i= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); - long /*int*/ pMonitor = GDK.gdk_display_get_primary_monitor(display); + long display = GDK.gdk_display_get_default(); + long pMonitor = GDK.gdk_display_get_primary_monitor(display); if (pMonitor == 0) { pMonitor = GDK.gdk_display_get_monitor(display, 0); } @@ -661,8 +661,8 @@ protected void init () { if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { double sx[] = new double[1]; double sy[] = new double[1]; - long /*int*/ gdkResource; - long /*int*/ surface; + long gdkResource; + long surface; if (GTK.GTK4) { surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_RGB24, 10, 10); } else { @@ -674,9 +674,9 @@ protected void init () { } /* Initialize the system font slot */ - long /*int*/ [] defaultFontArray = new long /*int*/ [1]; - long /*int*/ defaultFont; - long /*int*/ context = GTK.gtk_widget_get_style_context (shellHandle); + long [] defaultFontArray = new long [1]; + long defaultFont; + long context = GTK.gtk_widget_get_style_context (shellHandle); if ("ppc64le".equals(System.getProperty("os.arch"))) { defaultFont = GTK.gtk_style_context_get_font (context, GTK.GTK_STATE_FLAG_NORMAL); } else if (GTK.GTK_VERSION >= OS.VERSION(3, 18, 0)) { @@ -721,7 +721,7 @@ protected void init () { * Note that much of eclipse 'dark theme' is done by platform.ui's CSS engine, not by SWT. */ private void overrideThemeValues () { - long /*int*/ provider = GTK.gtk_css_provider_new(); + long provider = GTK.gtk_css_provider_new(); BiFunction load = (path, isResource) -> { try { @@ -773,14 +773,14 @@ private void overrideThemeValues () { } if (GTK.GTK4) { - long /*int*/ display = GDK.gdk_display_get_default(); + long display = GDK.gdk_display_get_default(); if (display == 0 || provider == 0) { System.err.println("SWT Warning: Override of theme values failed. Reason: could not acquire display or provider."); return; } GTK.gtk_style_context_add_provider_for_display (display, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } else { - long /*int*/ screen = GDK.gdk_screen_get_default(); + long screen = GDK.gdk_screen_get_default(); if (screen == 0 || provider == 0) { System.err.println("SWT Warning: Override of theme values failed. Reason: could not acquire screen or provider."); return; @@ -810,7 +810,7 @@ private void overrideThemeValues () { * @noreference This method is not intended to be referenced by clients. */ @Override -public abstract long /*int*/ internal_new_GC (GCData data); +public abstract long internal_new_GC (GCData data); /** * Invokes platform specific functionality to dispose a GC handle. @@ -828,7 +828,7 @@ public abstract long /*int*/ internal_new_GC (GCData data); * @noreference This method is not intended to be referenced by clients. */ @Override -public abstract void internal_dispose_GC (long /*int*/ hDC, GCData data); +public abstract void internal_dispose_GC (long hDC, GCData data); /** * Returns true if the device has been disposed, @@ -869,7 +869,7 @@ public boolean loadFont (String path) { return OS.FcConfigAppFontAddFile (0, buffer); } -long /*int*/ logProc (long /*int*/ log_domain, long /*int*/ log_level, long /*int*/ message, long /*int*/ user_data) { +long logProc (long log_domain, long log_level, long message, long user_data) { if (DEBUG) { new Error ().printStackTrace (); } @@ -1033,7 +1033,7 @@ public void setWarnings (boolean warnings) { } } -static long /*int*/ XErrorProc (long /*int*/ xDisplay, long /*int*/ xErrorEvent) { +static long XErrorProc (long xDisplay, long xErrorEvent) { Device device = findDevice (xDisplay); if (device != null) { if (device.warningLevel == 0) { @@ -1049,7 +1049,7 @@ static long /*int*/ XErrorProc (long /*int*/ xDisplay, long /*int*/ xErrorEvent) return 0; } -static long /*int*/ XIOErrorProc (long /*int*/ xDisplay) { +static long XIOErrorProc (long xDisplay) { Device device = findDevice (xDisplay); if (device != null) { if (DEBUG || device.debug) { @@ -1086,12 +1086,12 @@ protected int getDeviceZoom() { */ int dpi = 96; if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); - long /*int*/ monitor = GDK.gdk_display_get_monitor_at_point(display, 0, 0); + long display = GDK.gdk_display_get_default(); + long monitor = GDK.gdk_display_get_monitor_at_point(display, 0, 0); int scale = GDK.gdk_monitor_get_scale_factor(monitor); dpi = dpi * scale; } else { - long /*int*/ screen = GDK.gdk_screen_get_default(); + long screen = GDK.gdk_screen_get_default(); dpi = (int) GDK.gdk_screen_get_resolution (screen); if (dpi <= 0) dpi = 96; // gdk_screen_get_resolution returns -1 in case of error int monitor_num = GDK.gdk_screen_get_monitor_at_point (screen, 0, 0); @@ -1105,7 +1105,7 @@ protected int getDeviceZoom() { * @nooverride This method is not intended to be re-implemented or extended by clients. * @since 3.105 */ -protected long /*int*/ gsettingsProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ user_data) { +protected long gsettingsProc (long gobject, long arg1, long user_data) { switch((int)/*64*/user_data) { case CHANGE_SCALEFACTOR: this.scaleFactor = getDeviceZoom (); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java index 4d467612bd..a3c99db051 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java @@ -47,7 +47,7 @@ public final class Font extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; Font(Device device) { super(device); @@ -191,7 +191,7 @@ public boolean equals(Object object) { public FontData[] getFontData() { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - long /*int*/ family = OS.pango_font_description_get_family(handle); + long family = OS.pango_font_description_get_family(handle); int length = C.strlen(family); byte[] buffer = new byte[length]; C.memmove(buffer, family, length); @@ -205,7 +205,7 @@ public FontData[] getFontData() { if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= SWT.ITALIC; if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= SWT.ROMAN; if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= SWT.BOLD; - long /*int*/ fontString = OS.pango_font_description_to_string (handle); + long fontString = OS.pango_font_description_to_string (handle); length = C.strlen (fontString); buffer = new byte [length + 1]; C.memmove (buffer, fontString, length); @@ -230,7 +230,7 @@ public FontData[] getFontData() { * * @noreference This method is not intended to be referenced by clients. */ -public static Font gtk_new(Device device, long /*int*/ handle) { +public static Font gtk_new(Device device, long handle) { Font font = new Font(device); font.handle = handle; return font; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java index 1df0c59693..e8f0edba4d 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java @@ -71,7 +71,7 @@ public final class GC extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; Drawable drawable; GCData data; @@ -178,7 +178,7 @@ public GC(Drawable drawable, int style) { if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); GCData data = new GCData(); data.style = checkStyle(style); - long /*int*/ gdkGC = drawable.internal_new_GC(data); + long gdkGC = drawable.internal_new_GC(data); Device device = data.device; if (device == null) device = Device.getDevice(); if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); @@ -187,9 +187,9 @@ public GC(Drawable drawable, int style) { init(); } -static void addCairoString(long /*int*/ cairo, String string, float x, float y, Font font) { +static void addCairoString(long cairo, String string, float x, float y, Font font) { byte[] buffer = Converter.wcsToMbcs(string, true); - long /*int*/ layout = OS.pango_cairo_create_layout(cairo); + long layout = OS.pango_cairo_create_layout(cairo); if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.pango_layout_set_text(layout, buffer, -1); OS.pango_layout_set_font_description(layout, font.handle); @@ -212,14 +212,14 @@ static int checkStyle (int style) { * * @param cairo the cairo context to apply the region to */ -void cairoClipRegion (long /*int*/ cairo) { +void cairoClipRegion (long cairo) { if (cairo == 0) return; GdkRectangle rect = new GdkRectangle (); GDK.gdk_cairo_get_clip_rectangle (cairo, rect); cairo_rectangle_int_t cairoRect = new cairo_rectangle_int_t (); cairoRect.convertFromGdkRectangle(rect); - long /*int*/ regionHandle = data.regionSet; - long /*int*/ actualRegion = Cairo.cairo_region_create_rectangle(cairoRect); + long regionHandle = data.regionSet; + long actualRegion = Cairo.cairo_region_create_rectangle(cairoRect); Cairo.cairo_region_subtract(actualRegion, regionHandle); GDK.gdk_cairo_region(cairo, actualRegion); Cairo.cairo_clip(cairo); @@ -243,7 +243,7 @@ void cairoClipRegion (long /*int*/ cairo) { * * @noreference This method is not intended to be referenced by clients. */ -public static GC gtk_new(long /*int*/ handle, GCData data) { +public static GC gtk_new(long handle, GCData data) { GC gc = new GC(); gc.device = data.device; gc.init(null, data, handle); @@ -269,7 +269,7 @@ public static GC gtk_new(long /*int*/ handle, GCData data) { */ public static GC gtk_new(Drawable drawable, GCData data) { GC gc = new GC(); - long /*int*/ gdkGC = drawable.internal_new_GC(data); + long gdkGC = drawable.internal_new_GC(data); gc.device = data.device; gc.init(drawable, data, gdkGC); return gc; @@ -280,7 +280,7 @@ void checkGC (int mask) { if ((state & mask) == mask) return; state = (state ^ mask) & mask; data.state |= mask; - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if ((state & (BACKGROUND | FOREGROUND)) != 0) { GdkRGBA colorRGBA = null; Pattern pattern; @@ -295,7 +295,7 @@ void checkGC (int mask) { } if (pattern != null) { if ((data.style & SWT.MIRRORED) != 0 && pattern.surface != 0) { - long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface); + long newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface); if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_pattern_set_extend(newPattern, Cairo.CAIRO_EXTEND_REPEAT); double[] matrix = {-1, 0, 0, 1, 0, 0}; @@ -391,8 +391,8 @@ void checkGC (int mask) { } } -long /*int*/ convertRgn(long /*int*/ rgn, double[] matrix) { - long /*int*/ newRgn = Cairo.cairo_region_create(); +long convertRgn(long rgn, double[] matrix) { + long newRgn = Cairo.cairo_region_create(); if (isIdentity(matrix)) { Cairo.cairo_region_union(newRgn, rgn); return newRgn; @@ -425,7 +425,7 @@ long /*int*/ convertRgn(long /*int*/ rgn, double[] matrix) { Cairo.cairo_matrix_transform_point(matrix, x, y); pointArray[6] = (int)x[0]; pointArray[7] = (int)Math.round(y[0]); - long /*int*/ polyRgn = Region.gdk_region_polygon(pointArray, pointArray.length / 2, GDK.GDK_EVEN_ODD_RULE); + long polyRgn = Region.gdk_region_polygon(pointArray, pointArray.length / 2, GDK.GDK_EVEN_ODD_RULE); Cairo.cairo_region_union(newRgn, polyRgn); Cairo.cairo_region_destroy(polyRgn); } @@ -457,7 +457,7 @@ public void copyArea(Image image, int x, int y) { copyAreaInPixels(image, loc.x, loc.y); } void copyAreaInPixels(Image image, int x, int y) { - long /*int*/ cairo = Cairo.cairo_create(image.surface); + long cairo = Cairo.cairo_create(image.surface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_translate(cairo, -x, -y); Cairo.cairo_push_group(cairo); @@ -529,7 +529,7 @@ void copyAreaInPixels(int srcX, int srcY, int width, int height, int destX, int if (width <= 0 || height <= 0) return; int deltaX = destX - srcX, deltaY = destY - srcY; if (deltaX == 0 && deltaY == 0) return; - long /*int*/ drawable = data.drawable; + long drawable = data.drawable; if (data.image != null) { Cairo.cairo_set_source_surface(handle, data.image.surface, deltaX, deltaY); Cairo.cairo_rectangle(handle, destX, destY, width, height); @@ -555,15 +555,15 @@ void copyAreaInPixels(int srcX, int srcY, int width, int height, int destX, int Cairo.cairo_paint(handle); Cairo.cairo_restore(handle); if (paint) { - long /*int*/ visibleRegion = GDK.gdk_window_get_visible_region (drawable); + long visibleRegion = GDK.gdk_window_get_visible_region (drawable); cairo_rectangle_int_t srcRect = new cairo_rectangle_int_t (); srcRect.x = srcX; srcRect.y = srcY; srcRect.width = width; srcRect.height = height; - long /*int*/ copyRegion = Cairo.cairo_region_create_rectangle (srcRect); + long copyRegion = Cairo.cairo_region_create_rectangle (srcRect); Cairo.cairo_region_intersect(copyRegion, visibleRegion); - long /*int*/ invalidateRegion = Cairo.cairo_region_create_rectangle (srcRect); + long invalidateRegion = Cairo.cairo_region_create_rectangle (srcRect); Cairo.cairo_region_subtract (invalidateRegion, visibleRegion); Cairo.cairo_region_translate (invalidateRegion, deltaX, deltaY); if (GTK.GTK4) { @@ -616,16 +616,16 @@ void copyAreaInPixels(int srcX, int srcY, int width, int height, int destX, int } void createLayout() { - long /*int*/ context; + long context; if (GTK.GTK4) { - long /*int*/ fontMap = OS.pango_cairo_font_map_get_default (); + long fontMap = OS.pango_cairo_font_map_get_default (); context = OS.pango_font_map_create_context (fontMap); } else { context = GDK.gdk_pango_context_get(); } if (context == 0) SWT.error(SWT.ERROR_NO_HANDLES); data.context = context; - long /*int*/ layout = OS.pango_layout_new(context); + long layout = OS.pango_layout_new(context); if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES); data.layout = layout; OS.pango_context_set_language(context, GTK.gtk_get_default_language()); @@ -643,13 +643,13 @@ void disposeLayout() { @Override void destroy() { if (data.disposeCairo) { - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; Cairo.cairo_destroy(cairo); } data.cairo = 0; /* Free resources */ - long /*int*/ clipRgn = data.clipRgn; + long clipRgn = data.clipRgn; if (clipRgn != 0) Cairo.cairo_region_destroy(clipRgn); Image image = data.image; if (image != null) { @@ -716,7 +716,7 @@ void drawArcInPixels(int x, int y, int width, int height, int startAngle, int ar height = -height; } if (width == 0 || height == 0 || arcAngle == 0) return; - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; if (width == height) { if (arcAngle >= 0) { @@ -761,9 +761,9 @@ public void drawFocus(int x, int y, int width, int height) { drawFocusInPixels(loc.x, loc.y, loc.width, loc.height); } void drawFocusInPixels(int x, int y, int width, int height) { - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; checkGC(FOREGROUND); - long /*int*/ context = GTK.gtk_widget_get_style_context(data.device.shellHandle); + long context = GTK.gtk_widget_get_style_context(data.device.shellHandle); GTK.gtk_render_focus(context, cairo, x, y, width, height); } @@ -858,7 +858,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, SWT.error(SWT.ERROR_INVALID_ARGUMENT); } } - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (data.alpha != 0) { srcImage.createSurface(); Cairo.cairo_save(cairo); @@ -883,7 +883,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break; case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break; } - long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface); + long pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface); if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (srcWidth != destWidth || srcHeight != destHeight) { Cairo.cairo_pattern_set_extend(pattern, Cairo.CAIRO_EXTEND_PAD); @@ -921,7 +921,7 @@ public void drawLine(int x1, int y1, int x2, int y2) { } void drawLineInPixels(int x1, int y1, int x2, int y2) { checkGC(DRAW); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; if (Cairo.cairo_version() >= Cairo.CAIRO_VERSION_ENCODE(1, 12, 0)) { Cairo.cairo_set_antialias(cairo, Cairo.CAIRO_ANTIALIAS_BEST); @@ -967,7 +967,7 @@ void drawOvalInPixels(int x, int y, int width, int height) { y = y + height; height = -height; } - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; if (width == height) { Cairo.cairo_arc_negative(cairo, x + xOffset + width / 2f, y + yOffset + height / 2f, width / 2f, 0, -2 * (float)Math.PI); @@ -1010,11 +1010,11 @@ public void drawPath(Path path) { if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); initCairo(); checkGC(DRAW); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; Cairo.cairo_save(cairo); double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; Cairo.cairo_translate(cairo, xOffset, yOffset); - long /*int*/ copy = Cairo.cairo_copy_path(path.handle); + long copy = Cairo.cairo_copy_path(path.handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_append_path(cairo, copy); Cairo.cairo_path_destroy(copy); @@ -1046,7 +1046,7 @@ public void drawPoint (int x, int y) { } void drawPointInPixels (int x, int y) { checkGC(DRAW); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; Cairo.cairo_rectangle(cairo, x, y, 1, 1); Cairo.cairo_fill(cairo); } @@ -1076,7 +1076,7 @@ public void drawPolygon(int[] pointArray) { } void drawPolygonInPixels(int[] pointArray) { checkGC(DRAW); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; drawPolyline(cairo, pointArray, true); Cairo.cairo_stroke(cairo); } @@ -1106,12 +1106,12 @@ public void drawPolyline(int[] pointArray) { } void drawPolylineInPixels(int[] pointArray) { checkGC(DRAW); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; drawPolyline(cairo, pointArray, false); Cairo.cairo_stroke(cairo); } -void drawPolyline(long /*int*/ cairo, int[] pointArray, boolean close) { +void drawPolyline(long cairo, int[] pointArray, boolean close) { int count = pointArray.length / 2; if (count == 0) return; double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; @@ -1151,7 +1151,7 @@ void drawRectangleInPixels(int x, int y, int width, int height) { y = y + height; height = -height; } - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height); Cairo.cairo_stroke(cairo); @@ -1225,7 +1225,7 @@ void drawRoundRectangleInPixels(int x, int y, int width, int height, int arcWidt } if (naw < 0) naw = 0 - naw; if (nah < 0) nah = 0 - nah; - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; if (naw == 0 || nah == 0) { Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height); @@ -1403,7 +1403,7 @@ void drawTextInPixels (String string, int x, int y, int flags) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (string.length() == 0) return; - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; setString(string, flags); checkGC(FONT); if ((flags & SWT.DRAW_TRANSPARENT) == 0) { @@ -1496,7 +1496,7 @@ void fillArcInPixels(int x, int y, int width, int height, int startAngle, int ar height = -height; } if (width == 0 || height == 0 || arcAngle == 0) return; - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (width == height) { if (arcAngle >= 0) { Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, -startAngle * (float)Math.PI / 180, -(startAngle + arcAngle) * (float)Math.PI / 180); @@ -1570,8 +1570,8 @@ void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean fromRGB = backgroundRGB; toRGB = foregroundRGB; } - long /*int*/ cairo = data.cairo; - long /*int*/ pattern; + long cairo = data.cairo; + long pattern; if (DPIUtil.useCairoAutoScale() ) { /* @@ -1580,7 +1580,7 @@ void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean * device scale equal to current scale factor. So need * to set the device scale to current scale factor */ - long /*int*/ surface = Cairo.cairo_get_target(cairo); + long surface = Cairo.cairo_get_target(cairo); if (surface != 0) { float scaleFactor = DPIUtil.getDeviceZoom() / 100f; Cairo.cairo_surface_set_device_scale(surface, scaleFactor, scaleFactor); @@ -1640,7 +1640,7 @@ void fillOvalInPixels(int x, int y, int width, int height) { y = y + height; height = -height; } - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (width == height) { Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Math.PI); } else { @@ -1682,8 +1682,8 @@ public void fillPath (Path path) { if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); initCairo(); checkGC(FILL); - long /*int*/ cairo = data.cairo; - long /*int*/ copy = Cairo.cairo_copy_path(path.handle); + long cairo = data.cairo; + long copy = Cairo.cairo_copy_path(path.handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_append_path(cairo, copy); Cairo.cairo_path_destroy(copy); @@ -1717,7 +1717,7 @@ public void fillPolygon(int[] pointArray) { } void fillPolygonInPixels(int[] pointArray) { checkGC(FILL); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; drawPolyline(cairo, pointArray, true); Cairo.cairo_fill(cairo); } @@ -1751,7 +1751,7 @@ void fillRectangleInPixels(int x, int y, int width, int height) { y = y + height; height = -height; } - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (data.regionSet != 0) { cairoClipRegion(cairo); } else { @@ -1825,7 +1825,7 @@ void fillRoundRectangleInPixels(int x, int y, int width, int height, int arcWidt } if (naw < 0) naw = 0 - naw; if (nah < 0) nah = 0 - nah; - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (naw == 0 || nah == 0) { Cairo.cairo_rectangle(cairo, x, y, width, height); } else { @@ -2038,11 +2038,11 @@ Rectangle getClippingInPixels() { width = w[0]; height = h[0]; /* Intersect visible bounds with clipping in device space and then convert then to user space */ - long /*int*/ cairo = data.cairo; - long /*int*/ clipRgn = data.clipRgn; - long /*int*/ damageRgn = data.damageRgn; + long cairo = data.cairo; + long clipRgn = data.clipRgn; + long damageRgn = data.damageRgn; if (clipRgn != 0 || damageRgn != 0 || cairo != 0) { - long /*int*/ rgn = Cairo.cairo_region_create(); + long rgn = Cairo.cairo_region_create(); cairo_rectangle_int_t rect = new cairo_rectangle_int_t(); rect.width = width; rect.height = height; @@ -2098,10 +2098,10 @@ public void getClipping(Region region) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ clipping = region.handle; + long clipping = region.handle; Cairo.cairo_region_subtract(clipping, clipping); - long /*int*/ cairo = data.cairo; - long /*int*/ clipRgn = data.clipRgn; + long cairo = data.cairo; + long clipRgn = data.clipRgn; if (clipRgn == 0) { cairo_rectangle_int_t rect = new cairo_rectangle_int_t(); int[] width = new int[1], height = new int[1]; @@ -2112,7 +2112,7 @@ public void getClipping(Region region) { } else { /* Convert clipping to device space if needed */ if (data.clippingTransform != null && GTK.GTK_VERSION < OS.VERSION (3, 14, 0)) { - long /*int*/ rgn = convertRgn(clipRgn, data.clippingTransform); + long rgn = convertRgn(clipRgn, data.clippingTransform); Cairo.cairo_region_union(clipping, rgn); Cairo.cairo_region_destroy(rgn); } else { @@ -2127,7 +2127,7 @@ public void getClipping(Region region) { double[] matrix = new double[6]; Cairo.cairo_get_matrix(cairo, matrix); Cairo.cairo_matrix_invert(matrix); - long /*int*/ rgn = convertRgn(clipping, matrix); + long rgn = convertRgn(clipping, matrix); Cairo.cairo_region_subtract(clipping, clipping); Cairo.cairo_region_union(clipping, rgn); Cairo.cairo_region_destroy(rgn); @@ -2148,7 +2148,7 @@ public void getClipping(Region region) { */ public int getFillRule() { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (cairo == 0) return SWT.FILL_EVEN_ODD; return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD; } @@ -2184,9 +2184,9 @@ public FontMetrics getFontMetrics() { if (data.context == 0) createLayout(); checkGC(FONT); Font font = data.font; - long /*int*/ context = data.context; - long /*int*/ lang = OS.pango_context_get_language(context); - long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang); + long context = data.context; + long lang = OS.pango_context_get_language(context); + long metrics = OS.pango_context_get_metrics(context, font.handle, lang); FontMetrics fm = new FontMetrics(); int ascent = OS.pango_font_metrics_get_ascent(metrics); int descent = OS.pango_font_metrics_get_descent(metrics); @@ -2437,7 +2437,7 @@ void getSize(int[] width, int[] height) { } return; } - long /*int*/ surface = Cairo.cairo_get_target(handle); + long surface = Cairo.cairo_get_target(handle); switch (Cairo.cairo_surface_get_type(surface)) { case Cairo.CAIRO_SURFACE_TYPE_IMAGE: width[0] = Cairo.cairo_image_surface_get_width(surface); @@ -2471,7 +2471,7 @@ public int getTextAntialias() { if (data.cairo == 0) return SWT.DEFAULT; int antialias = Cairo.CAIRO_ANTIALIAS_DEFAULT; if (data.context != 0) { - long /*int*/ options = OS.pango_cairo_context_get_font_options(data.context); + long options = OS.pango_cairo_context_get_font_options(data.context); if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options); } switch (antialias) { @@ -2505,7 +2505,7 @@ public void getTransform(Transform transform) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (cairo != 0) { /* * The client wants to know the relative transformation they set for their widgets. @@ -2582,7 +2582,7 @@ double[] identity() { return identity; } -void init(Drawable drawable, GCData data, long /*int*/ gdkGC) { +void init(Drawable drawable, GCData data, long gdkGC) { if (data.foregroundRGBA != null) data.state &= ~FOREGROUND; if (data.backgroundRGBA != null) data.state &= ~(BACKGROUND | BACKGROUND_BG); if (data.font != null) data.state &= ~FONT; @@ -2599,7 +2599,7 @@ void init(Drawable drawable, GCData data, long /*int*/ gdkGC) { this.drawable = drawable; this.data = data; handle = gdkGC; - long /*int*/ cairo = data.cairo = handle; + long cairo = data.cairo = handle; Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD); data.state &= ~(BACKGROUND | FOREGROUND | FONT | LINE_WIDTH | LINE_CAP | LINE_JOIN | LINE_STYLE | DRAW_OFFSET); setClipping(data.clipRgn); @@ -2621,10 +2621,10 @@ void init(Drawable drawable, GCData data, long /*int*/ gdkGC) { } void initCairo() { - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (cairo != 0) return; if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ surface; + long surface; if (GTK.GTK4) { surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_A8, data.width, data.height); } else { @@ -2812,7 +2812,7 @@ public void setAntialias(int antialias) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } initCairo(); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; Cairo.cairo_set_antialias(cairo, mode); } @@ -2874,13 +2874,13 @@ public void setBackgroundPattern(Pattern pattern) { data.state &= ~BACKGROUND; } -static void setCairoFont(long /*int*/ cairo, Font font) { +static void setCairoFont(long cairo, Font font) { if (font == null || font.isDisposed()) return; setCairoFont(cairo, font.handle); } -static void setCairoFont(long /*int*/ cairo, long /*int*/ font) { - long /*int*/ family = OS.pango_font_description_get_family(font); +static void setCairoFont(long cairo, long font) { + long family = OS.pango_font_description_get_family(font); int length = C.strlen(family); byte[] buffer = new byte[length + 1]; C.memmove(buffer, family, length); @@ -2897,17 +2897,17 @@ static void setCairoFont(long /*int*/ cairo, long /*int*/ font) { Cairo.cairo_set_font_size(cairo, height); } -static void setCairoRegion(long /*int*/ cairo, long /*int*/ rgn) { +static void setCairoRegion(long cairo, long rgn) { GDK.gdk_cairo_region(cairo, rgn); } -static void setCairoPatternColor(long /*int*/ pattern, int offset, Color c, int alpha) { +static void setCairoPatternColor(long pattern, int offset, Color c, int alpha) { GdkRGBA rgba = c.handle; Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, rgba.red, rgba.green, rgba.blue, alpha / 255f); } -void setCairoClip(long /*int*/ damageRgn, long /*int*/ clipRgn) { - long /*int*/ cairo = data.cairo; +void setCairoClip(long damageRgn, long clipRgn) { + long cairo = data.cairo; Cairo.cairo_reset_clip(cairo); if (damageRgn != 0) { double[] matrix = new double[6]; @@ -2920,7 +2920,7 @@ void setCairoClip(long /*int*/ damageRgn, long /*int*/ clipRgn) { Cairo.cairo_set_matrix(cairo, matrix); } if (clipRgn != 0) { - long /*int*/ clipRgnCopy = Cairo.cairo_region_create(); + long clipRgnCopy = Cairo.cairo_region_create(); Cairo.cairo_region_union(clipRgnCopy, clipRgn); /* @@ -2943,7 +2943,7 @@ void setCairoClip(long /*int*/ damageRgn, long /*int*/ clipRgn) { * Intersects given clipping with original clipping of this context, so * that resulting clip does not allow to paint outside of the GC bounds. */ -private void limitClipping(long /*int*/ gcClipping) { +private void limitClipping(long gcClipping) { Region clippingRegion = new Region(); if (currentTransform != null) { // we want to apply GC clipping stored in init() as is, so we invert user transformations that may distort it @@ -3031,8 +3031,8 @@ private static Rectangle getTransformedClippingRectangle(int[] pointsArray) { return r; } -void setClipping(long /*int*/ clipRgn) { - long /*int*/ cairo = data.cairo; +void setClipping(long clipRgn) { + long cairo = data.cairo; if (clipRgn == 0) { if (data.clipRgn != 0) { Cairo.cairo_region_destroy(data.clipRgn); @@ -3084,7 +3084,7 @@ void setClippingInPixels(int x, int y, int width, int height) { rect.y = y; rect.width = width; rect.height = height; - long /*int*/ clipRgn = Cairo.cairo_region_create(); + long clipRgn = Cairo.cairo_region_create(); Cairo.cairo_region_union_rectangle(clipRgn, rect); setClipping(clipRgn); Cairo.cairo_region_destroy(clipRgn); @@ -3122,8 +3122,8 @@ public void setClipping(Path path) { resetClipping(); if (path != null) { initCairo(); - long /*int*/ cairo = data.cairo; - long /*int*/ copy = Cairo.cairo_copy_path(path.handle); + long cairo = data.cairo; + long copy = Cairo.cairo_copy_path(path.handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_append_path(cairo, copy); Cairo.cairo_path_destroy(copy); @@ -3644,7 +3644,7 @@ void setString(String string, int flags) { } byte[] buffer; int mnemonic, length = string.length (); - long /*int*/ layout = data.layout; + long layout = data.layout; char[] text = new char[length]; string.getChars(0, length, text, 0); if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) { @@ -3657,8 +3657,8 @@ void setString(String string, int flags) { buffer = new byte[buffer1.length + buffer2.length]; System.arraycopy(buffer1, 0, buffer, 0, buffer1.length); System.arraycopy(buffer2, 0, buffer, buffer1.length, buffer2.length); - long /*int*/ attr_list = OS.pango_attr_list_new(); - long /*int*/ attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW); + long attr_list = OS.pango_attr_list_new(); + long attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW); PangoAttribute attribute = new PangoAttribute(); OS.memmove(attribute, attr, PangoAttribute.sizeof); attribute.start_index = buffer1.length; @@ -3720,7 +3720,7 @@ public void setTextAntialias(int antialias) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } initCairo(); - long /*int*/ options = Cairo.cairo_font_options_create(); + long options = Cairo.cairo_font_options_create(); Cairo.cairo_font_options_set_antialias(options, mode); if (data.context == 0) createLayout(); OS.pango_cairo_context_set_font_options(data.context, options); @@ -3758,7 +3758,7 @@ public void setTransform(Transform transform) { if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); if (data.cairo == 0 && transform == null) return; initCairo(); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; if (GTK.GTK_VERSION >= OS.VERSION (3, 14, 0)) { // Re-set the original Cairo transformation matrix: it contains a translation relative to the parent widget. if (currentTransform != null) { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java index 157003f43f..ad4a198c4c 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java @@ -60,9 +60,9 @@ public final class GCData { public int interpolation = SWT.DEFAULT; public Image image; - public long /*int*/ clipRgn, context, layout, damageRgn, cairo, regionSet; + public long clipRgn, context, layout, damageRgn, cairo, regionSet; /** Usually a GdkWindow on GTK3, or a GdkSurface on GTK4 */ - public long /*int*/ drawable; + public long drawable; public double cairoXoffset, cairoYoffset; public boolean disposeCairo; public double[] identity, clippingTransform; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java index ef188eae2a..e3ea1be3db 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java @@ -99,7 +99,7 @@ public final class Image extends Resource implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ mask; + public long mask; /** * The handle to the OS cairo surface resource. @@ -113,7 +113,7 @@ public final class Image extends Resource implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ surface; + public long surface; /** * specifies the transparent pixel @@ -282,7 +282,7 @@ public Image(Device device, Image srcImage, int flag) { System.arraycopy(srcImage.alphaData, 0, alphaData, 0, alphaData.length); } - long /*int*/ imageSurface = srcImage.surface; + long imageSurface = srcImage.surface; int width = this.width = srcImage.width; int height = this.height = srcImage.height; int format = Cairo.cairo_surface_get_content(imageSurface) == Cairo.CAIRO_CONTENT_COLOR ? Cairo.CAIRO_FORMAT_RGB24 : Cairo.CAIRO_FORMAT_ARGB32; @@ -293,7 +293,7 @@ public Image(Device device, Image srcImage, int flag) { double scaleFactor = DPIUtil.getDeviceZoom() / 100f; Cairo.cairo_surface_set_device_scale(surface, scaleFactor, scaleFactor); } - long /*int*/ cairo = Cairo.cairo_create(surface); + long cairo = Cairo.cairo_create(surface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE); Cairo.cairo_set_source_surface (cairo, imageSurface, 0, 0); @@ -301,7 +301,7 @@ public Image(Device device, Image srcImage, int flag) { Cairo.cairo_destroy(cairo); if (flag != SWT.IMAGE_COPY) { int stride = Cairo.cairo_image_surface_get_stride(surface); - long /*int*/ data = Cairo.cairo_image_surface_get_data(surface); + long data = Cairo.cairo_image_surface_get_data(surface); int oa, or, og, ob; if (OS.BIG_ENDIAN) { oa = 0; or = 1; og = 2; ob = 3; @@ -793,7 +793,7 @@ void initNative(String filename) { char [] chars = new char [length]; filename.getChars (0, length, chars, 0); byte [] buffer = Converter.wcsToMbcs(chars, true); - long /*int*/ pixbuf = GDK.gdk_pixbuf_new_from_file(buffer, null); + long pixbuf = GDK.gdk_pixbuf_new_from_file(buffer, null); if (pixbuf != 0) { try { createFromPixbuf (SWT.BITMAP, pixbuf); @@ -804,13 +804,13 @@ void initNative(String filename) { } catch (SWTException e) {} } -void createFromPixbuf(int type, long /*int*/ pixbuf) { +void createFromPixbuf(int type, long pixbuf) { this.type = type; boolean hasAlpha = GDK.gdk_pixbuf_get_has_alpha(pixbuf); int width = this.width = GDK.gdk_pixbuf_get_width(pixbuf); int height = this.height = GDK.gdk_pixbuf_get_height(pixbuf); int stride = GDK.gdk_pixbuf_get_rowstride(pixbuf); - long /*int*/ pixels = GDK.gdk_pixbuf_get_pixels(pixbuf); + long pixels = GDK.gdk_pixbuf_get_pixels(pixbuf); int format = hasAlpha ? Cairo.CAIRO_FORMAT_ARGB32 : Cairo.CAIRO_FORMAT_RGB24; surface = Cairo.cairo_image_surface_create(format, width, height); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -818,7 +818,7 @@ void createFromPixbuf(int type, long /*int*/ pixbuf) { double scaleFactor = DPIUtil.getDeviceZoom() / 100f; Cairo.cairo_surface_set_device_scale(surface, scaleFactor, scaleFactor); } - long /*int*/ data = Cairo.cairo_image_surface_get_data(surface); + long data = Cairo.cairo_image_surface_get_data(surface); int cairoStride = Cairo.cairo_image_surface_get_stride(surface); int oa = 0, or = 0, og = 0, ob = 0; if (OS.BIG_ENDIAN) { @@ -872,7 +872,7 @@ void createMask() { int width = this.width; int height = this.height; int stride = Cairo.cairo_image_surface_get_stride(surface); - long /*int*/ surfaceData = Cairo.cairo_image_surface_get_data(surface); + long surfaceData = Cairo.cairo_image_surface_get_data(surface); int oa, or, og, ob, tr, tg, tb; if (OS.BIG_ENDIAN) { oa = 0; or = 1; og = 2; ob = 3; @@ -1065,12 +1065,12 @@ public ImageData getImageData () { public ImageData getImageDataAtCurrentZoom () { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - long /*int*/ surface = ImageList.convertSurface(this); + long surface = ImageList.convertSurface(this); int format = Cairo.cairo_image_surface_get_format(surface); int width = Cairo.cairo_image_surface_get_width(surface); int height = Cairo.cairo_image_surface_get_height(surface); int stride = Cairo.cairo_image_surface_get_stride(surface); - long /*int*/ surfaceData = Cairo.cairo_image_surface_get_data(surface); + long surfaceData = Cairo.cairo_image_surface_get_data(surface); boolean hasAlpha = format == Cairo.CAIRO_FORMAT_ARGB32; int oa, or, og, ob; if (OS.BIG_ENDIAN) { @@ -1190,7 +1190,7 @@ public ImageData getImageData (int zoom) { * * @noreference This method is not intended to be referenced by clients. */ -public static Image gtk_new(Device device, int type, long /*int*/ imageHandle, long /*int*/ mask) { +public static Image gtk_new(Device device, int type, long imageHandle, long mask) { Image image = new Image(device); image.type = type; image.surface = imageHandle; @@ -1214,7 +1214,7 @@ public static Image gtk_new(Device device, int type, long /*int*/ imageHandle, l * * @noreference This method is not intended to be referenced by clients. */ -public static Image gtk_new_from_pixbuf(Device device, int type, long /*int*/ pixbuf) { +public static Image gtk_new_from_pixbuf(Device device, int type, long pixbuf) { Image image = new Image(device); image.createFromPixbuf(type, pixbuf); image.type = type; @@ -1263,7 +1263,7 @@ void init(int width, int height) { } else { currentDeviceZoom = DPIUtil.getDeviceZoom(); } - long /*int*/ cairo = Cairo.cairo_create(surface); + long cairo = Cairo.cairo_create(surface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_source_rgb(cairo, 1, 1, 1); Cairo.cairo_rectangle(cairo, 0, 0, width, height); @@ -1290,7 +1290,7 @@ void init(ImageData image) { Cairo.cairo_surface_set_device_scale(surface, scaleFactor, scaleFactor); } int stride = Cairo.cairo_image_surface_get_stride(surface); - long /*int*/ data = Cairo.cairo_image_surface_get_data(surface); + long data = Cairo.cairo_image_surface_get_data(surface); int oa = 0, or = 0, og = 0, ob = 0; int redMask, greenMask, blueMask, destDepth = 32, destOrder; if (OS.BIG_ENDIAN) { @@ -1430,12 +1430,12 @@ void init(ImageData image) { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC (GCData data) { +public long internal_new_GC (GCData data) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (type != SWT.BITMAP || memGC != null) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - long /*int*/ gc = Cairo.cairo_create(surface); + long gc = Cairo.cairo_create(surface); if (data != null) { int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT; if ((data.style & mask) == 0) { @@ -1470,7 +1470,7 @@ public long /*int*/ internal_new_GC (GCData data) { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC (long /*int*/ hDC, GCData data) { +public void internal_dispose_GC (long hDC, GCData data) { Cairo.cairo_destroy(hDC); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java index 018fd7482d..710e2c3724 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java @@ -45,7 +45,7 @@ public final class Region extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; /** * Constructs a new empty region. @@ -89,12 +89,12 @@ public Region(Device device) { init(); } -Region(Device device, long /*int*/ handle) { +Region(Device device, long handle) { super(device); this.handle = handle; } -static long /*int*/ gdk_region_polygon(int[] pointArray, int npoints, int fill_rule) { +static long gdk_region_polygon(int[] pointArray, int npoints, int fill_rule) { //TODO this does not perform well and could fail if the polygon is too big int minX = pointArray[0], maxX = minX; int minY = pointArray[1], maxY = minY; @@ -106,9 +106,9 @@ static long /*int*/ gdk_region_polygon(int[] pointArray, int npoints, int fill_r if (y < minY) minY = y; if (y > maxY) maxY = y; } - long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, maxX - minX, maxY - minY); + long surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, maxX - minX, maxY - minY); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ cairo = Cairo.cairo_create(surface); + long cairo = Cairo.cairo_create(surface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_move_to(cairo, pointArray[0] - minX, pointArray[1] - minY); for (int i=2; i byteOffset) break; @@ -1071,9 +1071,9 @@ public FontMetrics getLineMetrics (int lineIndex) { int heightInPoints; int ascentInPoints; if (line.runs == 0) { - long /*int*/ font = this.font != null ? this.font.handle : device.systemFont.handle; - long /*int*/ lang = OS.pango_context_get_language(context); - long /*int*/ metrics = OS.pango_context_get_metrics(context, font, lang); + long font = this.font != null ? this.font.handle : device.systemFont.handle; + long lang = OS.pango_context_get_language(context); + long metrics = OS.pango_context_get_metrics(context, font, lang); int ascent = OS.pango_font_metrics_get_ascent(metrics); int descent = OS.pango_font_metrics_get_descent(metrics); ascentInPoints = DPIUtil.autoScaleDown(getDevice(), OS.PANGO_PIXELS(ascent)); @@ -1107,10 +1107,10 @@ public int[] getLineOffsets() { computeRuns(); int lineCount = OS.pango_layout_get_line_count(layout); int[] offsets = new int [lineCount + 1]; - long /*int*/ ptr = OS.pango_layout_get_text(layout); + long ptr = OS.pango_layout_get_text(layout); PangoLayoutLine line = new PangoLayoutLine(); for (int i = 0; i < lineCount; i++) { - long /*int*/ linePtr = OS.pango_layout_get_line(layout, i); + long linePtr = OS.pango_layout_get_line(layout, i); OS.memmove(line, linePtr, PangoLayoutLine.sizeof); int pos = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + line.start_index); offsets[i] = untranslateOffset(pos); @@ -1145,7 +1145,7 @@ Point getLocationInPixels(int offset, boolean trailing) { int length = text.length(); if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE); offset = translateOffset(offset); - long /*int*/ ptr = OS.pango_layout_get_text(layout); + long ptr = OS.pango_layout_get_text(layout); int byteOffset = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, offset) - ptr); int strlen = C.strlen(ptr); byteOffset = Math.min(byteOffset, strlen); @@ -1201,7 +1201,7 @@ int _getOffset (int offset, int movement, boolean forward) { OS.pango_layout_get_log_attrs(layout, attrs, nAttrs); if (attrs[0] == 0) return offset + step; - long /*int*/ ptr = OS.pango_layout_get_text(layout); + long ptr = OS.pango_layout_get_text(layout); int utf8Offset = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, translateOffset(offset)); int utf8Length = (int)/*64*/OS.g_utf8_strlen(ptr, -1); utf8Offset += step; @@ -1327,7 +1327,7 @@ int getOffsetInPixels(int x, int y, int[] trailing) { * visual offset. The fix is to clamp the coordinates inside the * line bounds. */ - long /*int*/ iter = OS.pango_layout_get_iter(layout); + long iter = OS.pango_layout_get_iter(layout); if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES); PangoRectangle rect = new PangoRectangle(); do { @@ -1347,7 +1347,7 @@ int getOffsetInPixels(int x, int y, int[] trailing) { int[] index = new int[1]; int[] piTrailing = new int[1]; OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing); - long /*int*/ ptr = OS.pango_layout_get_text(layout); + long ptr = OS.pango_layout_get_text(layout); int offset = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + index[0]); if (trailing != null) { trailing[0] = piTrailing[0]; @@ -2131,7 +2131,7 @@ void setTabsInPixels (int[] tabs) { if (tabs == null) { OS.pango_layout_set_tabs(layout, device.emptyTab); } else { - long /*int*/ tabArray = OS.pango_tab_array_new(tabs.length, true); + long tabArray = OS.pango_tab_array_new(tabs.length, true); if (tabArray != 0) { for (int i = 0; i < tabs.length; i++) { OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java index 542776c0d8..6c3ff7457e 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java @@ -127,8 +127,8 @@ public final class Converter { * @return char array representing the string. Usually used for String construction like: new String(mbcsToWcs(..)) */ public static char [] mbcsToWcs (byte [] buffer) { - long /*int*/ [] items_written = new long /*int*/ [1]; - long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null); + long [] items_written = new long [1]; + long ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null); if (ptr == 0) return EmptyCharArray; int length = (int)/*64*/items_written [0]; char [] chars = new char [length]; @@ -180,7 +180,7 @@ public static byte [] javaStringToCString (String string) { * as otherwise you can get unpredictable behavior). * @return a Java String object. */ -public static String cCharPtrToJavaString(long /*int*/ cCharPtr, boolean freecCharPtr) { +public static String cCharPtrToJavaString(long cCharPtr, boolean freecCharPtr) { int length = C.strlen (cCharPtr); byte[] buffer = new byte [length]; C.memmove (buffer, cCharPtr, length); @@ -201,12 +201,12 @@ public static String cCharPtrToJavaString(long /*int*/ cCharPtr, boolean freecCh * @return byte array that can be passed to a native function. */ public static byte [] wcsToMbcs (char [] chars, boolean terminate) { - long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1]; + long [] items_read = new long [1], items_written = new long [1]; /* * Note that g_utf16_to_utf8() stops converting * when it finds the first NULL. */ - long /*int*/ ptr = OS.g_utf16_to_utf8 (chars, chars.length, items_read, items_written, null); + long ptr = OS.g_utf16_to_utf8 (chars, chars.length, items_read, items_written, null); if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray; int written = (int)/*64*/items_written [0]; byte [] bytes = new byte [written + (terminate ? 1 : 0)]; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java index 04ef1e435c..e9db1c6bb7 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java @@ -203,8 +203,8 @@ public class GDBus { * @return void. (No return value actually returned to OS. Just SWT mechanism dicates 'long' is returned. */ @SuppressWarnings("unused") // Callback only called directly by JNI. - private static long /*int*/ onBusAcquired (long /*int*/ gDBusConnection, long /*int*/ const_gchar_name, long /*int*/ user_data) { - long /*int*/ gdBusNodeInfo; + private static long onBusAcquired (long gDBusConnection, long const_gchar_name, long user_data) { + long gdBusNodeInfo; { // Generate and parse DBus XML interface. StringBuilder dbus_introspection_xml = new StringBuilder(); @@ -217,7 +217,7 @@ public class GDBus { } dbus_introspection_xml.append(""); - long /*int*/ [] error = new long /*int*/ [1]; + long [] error = new long [1]; gdBusNodeInfo = OS.g_dbus_node_info_new_for_xml(Converter.javaStringToCString(dbus_introspection_xml.toString()), error); if (gdBusNodeInfo == 0 || error[0] != 0) { System.err.println("SWT GDBus: Failed to get introspection data"); @@ -226,9 +226,9 @@ public class GDBus { } { // Register object - long /*int*/ [] error = new long /*int*/ [1]; - long /*int*/ interface_info = OS.g_dbus_node_info_lookup_interface(gdBusNodeInfo, Converter.javaStringToCString(INTERFACE_NAME)); - long /*int*/ vtable [] = { handleMethod.getAddress(), 0, 0 }; + long [] error = new long [1]; + long interface_info = OS.g_dbus_node_info_lookup_interface(gdBusNodeInfo, Converter.javaStringToCString(INTERFACE_NAME)); + long vtable [] = { handleMethod.getAddress(), 0, 0 }; OS.g_dbus_connection_register_object( gDBusConnection, Converter.javaStringToCString(DBUS_OBJECT_NAME), @@ -255,13 +255,13 @@ public class GDBus { @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onNameAcquired (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { + private static long onNameAcquired (long connection, long name, long user_data) { // Currently not used, but can be used if acquring the gdbus name should trigger something to load. return 0; } @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onNameLost (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { + private static long onNameLost (long connection, long name, long user_data) { // Currently not used, but can be used if losing the gdbus name should trigger something. // As a note, if another instance steals the name, upon it's terminate the session is returned to it's former owner. return 0; @@ -287,13 +287,13 @@ public class GDBus { * @return */ @SuppressWarnings("unused") // Callback only called directly by JNI. - private static long /*int*/ handleMethod ( - long /*int*/ connection, long /*int*/ sender, - long /*int*/ object_path, long /*int*/ interface_name, - long /*int*/ method_name, long /*int*/ gvar_parameters, - long /*int*/ invocation, long /*int*/ user_data) { + private static long handleMethod ( + long connection, long sender, + long object_path, long interface_name, + long method_name, long gvar_parameters, + long invocation, long user_data) { - long /*int*/ resultGVariant = 0; + long resultGVariant = 0; try { String java_method_name = Converter.cCharPtrToJavaString(method_name, false); for (GDBusMethod gdbusMethod : gdbusMethods) { @@ -327,7 +327,7 @@ public class GDBus { * * @param gVariant a pointer to the native GVariant */ - private static Object[] convertGVariantToJava(long /*int*/ gVariant) { + private static Object[] convertGVariantToJava(long gVariant) { Object retVal = convertGVariantToJavaHelper(gVariant); if (retVal instanceof Object[]) { return (Object[]) retVal; @@ -337,7 +337,7 @@ public class GDBus { } } - private static Object convertGVariantToJavaHelper(long /*int*/ gVariant){ + private static Object convertGVariantToJavaHelper(long gVariant){ // - Developer note: // When instantiating GDBus dynamically (as we do), // GDBus's 'Parameters' is _always_ a tuple of stuff. @@ -397,7 +397,7 @@ public class GDBus { * * @return pointer GVariant * */ - private static long /*int*/ convertJavaToGVariant(Object javaObject) throws SWTException { + private static long convertJavaToGVariant(Object javaObject) throws SWTException { if (javaObject == null) { return 0; } @@ -426,7 +426,7 @@ public class GDBus { Object[] arrayValue = (Object[]) javaObject; int length = arrayValue.length; - long /*int*/ variants[] = new long /*int*/[length]; + long variants[] = new long /*int*/[length]; for (int i = 0; i < length; i++) { variants[i] = convertJavaToGVariant(arrayValue[i]); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java index 887c1e9b27..e2eefc55c9 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java @@ -20,17 +20,17 @@ import org.eclipse.swt.internal.cairo.*; import org.eclipse.swt.internal.gtk.*; public class ImageList { - long /*int*/ [] pixbufs; + long [] pixbufs; int width = -1, height = -1; Image [] images; public ImageList() { images = new Image [4]; - pixbufs = new long /*int*/ [4]; + pixbufs = new long [4]; } -public static long /*int*/ convertSurface(Image image) { - long /*int*/ newSurface = image.surface; +public static long convertSurface(Image image) { + long newSurface = image.surface; int type = Cairo.cairo_surface_get_type(newSurface); if (type != Cairo.CAIRO_SURFACE_TYPE_IMAGE) { Rectangle bounds; @@ -52,7 +52,7 @@ public static long /*int*/ convertSurface(Image image) { } Cairo.cairo_surface_set_device_scale(newSurface, sx[0], sy[0]); } - long /*int*/ cairo = Cairo.cairo_create(newSurface); + long cairo = Cairo.cairo_create(newSurface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE); Cairo.cairo_set_source_surface (cairo, image.surface, 0, 0); @@ -64,16 +64,16 @@ public static long /*int*/ convertSurface(Image image) { return newSurface; } -public static long /*int*/ createPixbuf(Image image) { - long /*int*/ surface = convertSurface(image); +public static long createPixbuf(Image image) { + long surface = convertSurface(image); int format = Cairo.cairo_image_surface_get_format(surface); int width = Cairo.cairo_image_surface_get_width(surface); int height = Cairo.cairo_image_surface_get_height(surface); boolean hasAlpha = format == Cairo.CAIRO_FORMAT_ARGB32; - long /*int*/ pixbuf = GDK.gdk_pixbuf_new (GDK.GDK_COLORSPACE_RGB, hasAlpha, 8, width, height); + long pixbuf = GDK.gdk_pixbuf_new (GDK.GDK_COLORSPACE_RGB, hasAlpha, 8, width, height); if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES); int stride = GDK.gdk_pixbuf_get_rowstride (pixbuf); - long /*int*/ pixels = GDK.gdk_pixbuf_get_pixels (pixbuf); + long pixels = GDK.gdk_pixbuf_get_pixels (pixbuf); int oa, or, og, ob; if (OS.BIG_ENDIAN) { oa = 0; or = 1; og = 2; ob = 3; @@ -81,7 +81,7 @@ public static long /*int*/ createPixbuf(Image image) { oa = 3; or = 2; og = 1; ob = 0; } byte[] line = new byte[stride]; - long /*int*/ surfaceData = Cairo.cairo_image_surface_get_data(surface); + long surfaceData = Cairo.cairo_image_surface_get_data(surface); if (hasAlpha) { for (int y = 0; y < height; y++) { C.memmove (line, surfaceData + (y * stride), stride); @@ -136,7 +136,7 @@ public int add (Image image) { Image [] newImages = new Image [images.length + 4]; System.arraycopy (images, 0, newImages, 0, images.length); images = newImages; - long /*int*/ [] newPixbufs = new long /*int*/ [pixbufs.length + 4]; + long [] newPixbufs = new long [pixbufs.length + 4]; System.arraycopy (pixbufs, 0, newPixbufs, 0, pixbufs.length); pixbufs = newPixbufs; } @@ -157,7 +157,7 @@ public Image get (int index) { return images [index]; } -public long /*int*/ getPixbuf (int index) { +public long getPixbuf (int index) { return pixbufs [index]; } @@ -169,7 +169,7 @@ public int indexOf (Image image) { return -1; } -public int indexOf (long /*int*/ pixbuf) { +public int indexOf (long pixbuf) { if (pixbuf == 0) return -1; for (int index=0; index= OS.VERSION(3, 22, 0) && ((text != null && text.isEmpty()) || text == null)) { return; @@ -942,13 +942,13 @@ void setForegroundGdkRGBA (GdkRGBA rgba) { } @Override -void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setForegroundGdkRGBA (long handle, GdkRGBA rgba) { if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) { super.setForegroundGdkRGBA(handle, rgba); return; } GdkRGBA toSet = rgba == null ? display.COLOR_WIDGET_FOREGROUND_RGBA : rgba; - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); // Form foreground string String color = display.gtk_rgba_to_css_string(toSet); @@ -1038,7 +1038,7 @@ public void setImage (Image image) { if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); imageList = new ImageList (); int imageIndex = imageList.add (image); - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + long pixbuf = imageList.getPixbuf (imageIndex); gtk_image_set_from_gicon(imageHandle, pixbuf); } else { gtk_image_set_from_gicon (imageHandle, 0); @@ -1176,7 +1176,7 @@ void showWidget () { } @Override -int traversalCode(int key, long /*int*/ event) { +int traversalCode(int key, long event) { int code = super.traversalCode (key, event); if ((style & SWT.ARROW) != 0) code &= ~(SWT.TRAVERSE_TAB_NEXT | SWT.TRAVERSE_TAB_PREVIOUS); if ((style & SWT.RADIO) != 0) code |= SWT.TRAVERSE_ARROW_NEXT | SWT.TRAVERSE_ARROW_PREVIOUS; @@ -1184,7 +1184,7 @@ int traversalCode(int key, long /*int*/ event) { } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long user_data) { /* * For Labels/Buttons, the first widget in the tree with a GdkWindow is SwtFixed. * Unfortunately this fails the check in !GTK_IS_CONTAINER check Widget.windowProc(). diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java index 03ad58e100..fc6e3e411b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java @@ -151,27 +151,27 @@ } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { if (ime != null) { - long /*int*/ result = ime.gtk_button_press_event (widget, event); + long result = ime.gtk_button_press_event (widget, event); if (result != 0) return result; } return super.gtk_button_press_event (widget, event); } @Override -long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) { +long gtk_commit (long imcontext, long text) { if (ime != null) { - long /*int*/ result = ime.gtk_commit (imcontext, text); + long result = ime.gtk_commit (imcontext, text); if (result != 0) return result; } return super.gtk_commit (imcontext, text); } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if ((state & OBSCURED) != 0) return 0; - long /*int*/ result; + long result; if ( GTK.GTK_VERSION < OS.VERSION(3, 22, 0)) { boolean isFocus = caret != null && caret.isFocusCaret (); if (isFocus) caret.killFocus (); @@ -194,7 +194,7 @@ return result; } -private void drawCaret (long /*int*/ widget, long /*int*/ cairo) { +private void drawCaret (long widget, long cairo) { if(this.isDisposed()) return; if (cairo == 0) error(SWT.ERROR_NO_HANDLES); if (drawFlag) { @@ -202,7 +202,7 @@ if (caret.image != null && !caret.image.isDisposed() && caret.image.mask == 0) { Cairo.cairo_set_source_rgb(cairo, 1, 1, 1); Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_DIFFERENCE); - long /*int*/ surface = Cairo.cairo_get_target(cairo); + long surface = Cairo.cairo_get_target(cairo); int nWidth = 0; switch (Cairo.cairo_surface_get_type(surface)) { case Cairo.CAIRO_SURFACE_TYPE_IMAGE: @@ -236,23 +236,23 @@ } @Override -long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_focus_in_event (widget, event); +long gtk_focus_in_event (long widget, long event) { + long result = super.gtk_focus_in_event (widget, event); if (caret != null) caret.setFocus (); return result; } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_focus_out_event (widget, event); +long gtk_focus_out_event (long widget, long event) { + long result = super.gtk_focus_out_event (widget, event); if (caret != null) caret.killFocus (); return result; } @Override -long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { +long gtk_preedit_changed (long imcontext) { if (ime != null) { - long /*int*/ result = ime.gtk_preedit_changed (imcontext); + long result = ime.gtk_preedit_changed (imcontext); if (result != 0) return result; } return super.gtk_preedit_changed (imcontext); @@ -327,8 +327,8 @@ if (!isVisible ()) return; boolean isFocus = caret != null && caret.isFocusCaret (); if (isFocus) caret.killFocus (); - long /*int*/ window = paintWindow (); - long /*int*/ visibleRegion = GDK.gdk_window_get_visible_region (window); + long window = paintWindow (); + long visibleRegion = GDK.gdk_window_get_visible_region (window); cairo_rectangle_int_t srcRect = new cairo_rectangle_int_t (); srcRect.x = x; srcRect.y = y; @@ -339,8 +339,8 @@ * hopping effect. See bug 480458. */ if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0)) { - long /*int*/ hBarHandle = 0; - long /*int*/ vBarHandle = 0; + long hBarHandle = 0; + long vBarHandle = 0; if (GTK.GTK_IS_SCROLLED_WINDOW(scrolledHandle)) { hBarHandle = GTK.gtk_scrolled_window_get_hscrollbar (scrolledHandle); vBarHandle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle); @@ -361,9 +361,9 @@ } srcRect.width = width; srcRect.height = height; - long /*int*/ copyRegion = Cairo.cairo_region_create_rectangle (srcRect); + long copyRegion = Cairo.cairo_region_create_rectangle (srcRect); Cairo.cairo_region_intersect(copyRegion, visibleRegion); - long /*int*/ invalidateRegion = Cairo.cairo_region_create_rectangle (srcRect); + long invalidateRegion = Cairo.cairo_region_create_rectangle (srcRect); Cairo.cairo_region_subtract (invalidateRegion, visibleRegion); Cairo.cairo_region_translate (invalidateRegion, deltaX, deltaY); cairo_rectangle_int_t copyRect = new cairo_rectangle_int_t(); @@ -377,10 +377,10 @@ redrawWidget (x, y, width, height, false, false, false); redrawWidget (destX, destY, width, height, false, false, false); } else { - long /*int*/ cairo = 0; - long /*int*/ context = 0; + long cairo = 0; + long context = 0; if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ cairo_region = GDK.gdk_window_get_visible_region(window); + long cairo_region = GDK.gdk_window_get_visible_region(window); context = GDK.gdk_window_begin_draw_frame(window, cairo_region); cairo = GDK.gdk_drawing_context_get_cairo_context(context); } else { @@ -531,7 +531,7 @@ } void updateCaret () { - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle == 0) return; GdkRectangle rect = new GdkRectangle (); rect.x = caret.x; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java index 4db9d368e4..b71f625078 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java @@ -103,13 +103,13 @@ boolean drawCaret () { if (parent == null) return false; if (parent.isDisposed ()) return false; if (GTK.GTK_VERSION < OS.VERSION (3, 22, 0)) { - long /*int*/ window = parent.paintWindow (); - long /*int*/ cairo = GDK.gdk_cairo_create(window); + long window = parent.paintWindow (); + long cairo = GDK.gdk_cairo_create(window); if (cairo == 0) error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_source_rgba(cairo, 1.0, 1.0, 1.0, 1.0); Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_DIFFERENCE); if (image != null && !image.isDisposed() && image.mask == 0) { - long /*int*/ surface = Cairo.cairo_get_target(cairo); + long surface = Cairo.cairo_get_target(cairo); int nWidth = 0; switch (Cairo.cairo_surface_get_type(surface)) { case Cairo.CAIRO_SURFACE_TYPE_IMAGE: diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java index 5a3ea4680e..cea49d7de2 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java @@ -129,7 +129,7 @@ public RGB[] getRGBs() { */ public RGB open () { byte [] buffer = Converter.wcsToMbcs (title, true); - long /*int*/ handle = GTK.gtk_color_chooser_dialog_new (buffer, parent.topHandle ()); + long handle = GTK.gtk_color_chooser_dialog_new (buffer, parent.topHandle ()); Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); GdkRGBA rgba; rgba = new GdkRGBA (); @@ -142,7 +142,7 @@ public RGB open () { GTK.gtk_color_chooser_set_rgba (handle, rgba); if (rgbs != null) { int colorsPerRow = 9; - long /*int*/ gdkRGBAS = OS.g_malloc(GdkRGBA.sizeof * rgbs.length); + long gdkRGBAS = OS.g_malloc(GdkRGBA.sizeof * rgbs.length); rgba = new GdkRGBA (); for (int i=0; i= OS.VERSION(3, 20, 0)) { GTK.gtk_container_forall(handle, display.allChildrenProc, 0); if (display.allChildren != 0) { - long /*int*/ list = display.allChildren; + long list = display.allChildren; while (list != 0) { - long /*int*/ widget = OS.g_list_data(list); + long widget = OS.g_list_data(list); if (widget != 0) { childHandle = widget; break; @@ -719,9 +719,9 @@ long /*int*/ findButtonHandle() { GTK.gtk_container_forall (childHandle, display.allChildrenProc, 0); if (display.allChildren != 0) { - long /*int*/ list = display.allChildren; + long list = display.allChildren; while (list != 0) { - long /*int*/ widget = OS.g_list_data (list); + long widget = OS.g_list_data (list); if (GTK.GTK_IS_BUTTON (widget)) { result = widget; break; @@ -734,14 +734,14 @@ long /*int*/ findButtonHandle() { return result; } -long /*int*/ findArrowHandle() { - long /*int*/ result = 0; +long findArrowHandle() { + long result = 0; if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) && cellBoxHandle != 0) { GTK.gtk_container_forall (cellBoxHandle, display.allChildrenProc, 0); if (display.allChildren != 0) { - long /*int*/ list = display.allChildren; + long list = display.allChildren; while (list != 0) { - long /*int*/ widget = OS.g_list_data (list); + long widget = OS.g_list_data (list); /* * Feature in GTK: GtkIcon isn't public, so we have to do * type lookups using gtk_widget_get_name(). See bug 539367. @@ -759,14 +759,14 @@ long /*int*/ findArrowHandle() { return result; } -long /*int*/ findMenuHandle() { +long findMenuHandle() { if (popupHandle == 0) return 0; - long /*int*/ result = 0; + long result = 0; GTK.gtk_container_forall (popupHandle, display.allChildrenProc, 0); if (display.allChildren != 0) { - long /*int*/ list = display.allChildren; + long list = display.allChildren; while (list != 0) { - long /*int*/ widget = OS.g_list_data (list); + long widget = OS.g_list_data (list); if (OS.G_OBJECT_TYPE (widget) == GTK.GTK_TYPE_MENU ()) { result = widget; break; @@ -780,7 +780,7 @@ long /*int*/ findMenuHandle() { } @Override -void fixModal (long /*int*/ group, long /*int*/ modalGroup) { +void fixModal (long group, long modalGroup) { if (popupHandle != 0) { if (group != 0) { GTK.gtk_window_group_add_window (group, popupHandle); @@ -802,7 +802,7 @@ void fixIM () { * filter has to be called by SWT. */ if (gdkEventKey != 0 && gdkEventKey != -1) { - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { GTK.gtk_im_context_filter_keypress (imContext, gdkEventKey); gdkEventKey = -1; @@ -813,13 +813,13 @@ void fixIM () { } @Override -long /*int*/ fontHandle () { +long fontHandle () { if (entryHandle != 0) return entryHandle; return super.fontHandle (); } @Override -long /*int*/ focusHandle () { +long focusHandle () { if (entryHandle != 0) return entryHandle; return super.focusHandle (); } @@ -844,9 +844,9 @@ void hookEvents () { OS.g_signal_connect_closure (entryHandle, OS.populate_popup, display.getClosure (POPULATE_POPUP), false); } - hookEvents(new long /*int*/ [] {buttonHandle, entryHandle, menuHandle}); + hookEvents(new long [] {buttonHandle, entryHandle, menuHandle}); - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { OS.g_signal_connect_closure (imContext, OS.commit, display.getClosure (COMMIT), false); int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ()); @@ -855,16 +855,16 @@ void hookEvents () { } } -void hookEvents(long /*int*/ [] handles) { +void hookEvents(long [] handles) { int eventMask = GDK.GDK_POINTER_MOTION_MASK | GDK.GDK_BUTTON_PRESS_MASK | GDK.GDK_BUTTON_RELEASE_MASK; for (int i=0; i= OS.VERSION(3, 20, 0)) { - long /*int*/ parentHandle = GTK.gtk_widget_get_parent(fixedHandle); + long parentHandle = GTK.gtk_widget_get_parent(fixedHandle); if (parentHandle != 0) { if (parent.fixClipHandle == 0) parent.fixClipHandle = parentHandle; if (firstDraw) { if ((style & SWT.READ_ONLY) != 0) { - long /*int*/ [] array = {fixedHandle, handle, buttonBoxHandle, buttonHandle, cellBoxHandle, cellHandle}; + long [] array = {fixedHandle, handle, buttonBoxHandle, buttonHandle, cellBoxHandle, cellHandle}; parent.fixClipMap.put(this, array); } else { - long /*int*/ [] array = {fixedHandle, handle, entryHandle, buttonBoxHandle, buttonHandle}; + long [] array = {fixedHandle, handle, entryHandle, buttonBoxHandle, buttonHandle}; parent.fixClipMap.put(this, array); } firstDraw = false; @@ -1545,7 +1545,7 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { +long gtk_event_after (long widget, long gdkEvent) { /* * Feature in GTK. Depending on where the user clicks, GTK prevents * the left mouse button event from being propagated. The fix is to @@ -1612,13 +1612,13 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { fixIM (); return super.gtk_focus_out_event (widget, event); } @Override -long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) { +long gtk_insert_text (long widget, long new_text, long new_text_length, long position) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text == 0 || new_text_length == 0) return 0; byte [] buffer = new byte [(int)/*64*/new_text_length]; @@ -1626,7 +1626,7 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long / String oldText = new String (Converter.mbcsToWcs (buffer)); int [] pos = new int [1]; C.memmove (pos, position, 4); - long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle); + long ptr = GTK.gtk_entry_get_text (entryHandle); if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, pos [0]); String newText = verifyText (oldText, start, start); @@ -1659,8 +1659,8 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long / } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_key_press_event (widget, event); +long gtk_key_press_event (long widget, long event) { + long result = super.gtk_key_press_event (widget, event); if (result != 0) { gdkEventKey = 0; fixIM (); @@ -1710,7 +1710,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { +long gtk_populate_popup (long widget, long menu) { if ((style & SWT.RIGHT_TO_LEFT) != 0) { GTK.gtk_widget_set_direction (menu, GTK.GTK_TEXT_DIR_RTL); GTK.gtk_container_forall (menu, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL); @@ -1719,7 +1719,7 @@ long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { } @Override -long /*int*/ gtk_selection_done(long /*int*/ menushell) { +long gtk_selection_done(long menushell) { int index = GTK.gtk_combo_box_get_active (handle); unselected = false; if (indexSelected == -1){ @@ -1732,7 +1732,7 @@ long /*int*/ gtk_selection_done(long /*int*/ menushell) { } @Override -long /*int*/ gtk_style_updated (long /*int*/ widget) { +long gtk_style_updated (long widget) { setButtonHandle (findButtonHandle ()); setMenuHandle (findMenuHandle ()); return super.gtk_style_updated (widget); @@ -1790,19 +1790,19 @@ public int indexOf (String string, int start) { } @Override -boolean isFocusHandle(long /*int*/ widget) { +boolean isFocusHandle(long widget) { if (buttonHandle != 0 && widget == buttonHandle) return true; if (entryHandle != 0 && widget == entryHandle) return true; return super.isFocusHandle (widget); } @Override -long /*int*/ paintWindow () { - long /*int*/ childHandle = entryHandle != 0 ? entryHandle : handle; +long paintWindow () { + long childHandle = entryHandle != 0 ? entryHandle : handle; GTK.gtk_widget_realize (childHandle); - long /*int*/ window = gtk_widget_get_window (childHandle); + long window = gtk_widget_get_window (childHandle); if ((style & SWT.READ_ONLY) != 0) return window; - long /*int*/ children = GDK.gdk_window_get_children (window); + long children = GDK.gdk_window_get_children (window); if (children != 0) { /* * The only direct child of GtkComboBox since 3.20 is GtkBox thus the children @@ -1822,12 +1822,12 @@ long /*int*/ paintWindow () { } @Override -long /*int*/ paintSurface () { - long /*int*/ childHandle = entryHandle != 0 ? entryHandle : handle; +long paintSurface () { + long childHandle = entryHandle != 0 ? entryHandle : handle; GTK.gtk_widget_realize (childHandle); - long /*int*/ surface = gtk_widget_get_surface (childHandle); + long surface = gtk_widget_get_surface (childHandle); if ((style & SWT.READ_ONLY) != 0) return surface; - long /*int*/ children = GDK.gdk_surface_get_children (surface); + long children = GDK.gdk_surface_get_children (surface); if (children != 0) { /* * The only direct child of GtkComboBox since 3.20 is GtkBox thus the children @@ -1866,7 +1866,7 @@ public void paste () { } @Override -long /*int*/ parentingHandle() { +long parentingHandle() { return fixedHandle; } @@ -1877,7 +1877,7 @@ void register () { if (entryHandle != 0) display.addWidget (entryHandle, this); if (popupHandle != 0) display.addWidget (popupHandle, this); if (menuHandle != 0) display.addWidget (menuHandle, this); - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) display.addWidget (imContext, this); } @@ -2151,7 +2151,7 @@ void setButtonBackgroundGdkRGBA (GdkRGBA rgba) { String css = "* {background: " + color + ";}\n"; cssButtonBackground = css; String finalCss = display.gtk_css_create_css_color_string (cssButtonBackground, cssButtonForeground, SWT.BACKGROUND); - long /*int*/ buttonContext = GTK.gtk_widget_get_style_context(buttonHandle); + long buttonContext = GTK.gtk_widget_get_style_context(buttonHandle); if (buttonProvider == 0) { buttonProvider = GTK.gtk_css_provider_new(); GTK.gtk_style_context_add_provider(buttonContext, buttonProvider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -2175,7 +2175,7 @@ void setButtonForegroundGdkRGBA (GdkRGBA rgba) { String css = "* {color: " + color + ";}\n"; cssButtonForeground = css; String finalCss = display.gtk_css_create_css_color_string(cssButtonBackground, cssButtonForeground, SWT.FOREGROUND); - long /*int*/ buttonContext = GTK.gtk_widget_get_style_context(buttonHandle); + long buttonContext = GTK.gtk_widget_get_style_context(buttonHandle); if (buttonProvider == 0) { buttonProvider = GTK.gtk_css_provider_new(); GTK.gtk_style_context_add_provider(buttonContext, buttonProvider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -2189,7 +2189,7 @@ void setButtonForegroundGdkRGBA (GdkRGBA rgba) { } @Override -void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGdkRGBA (long context, long handle, GdkRGBA rgba) { if (rgba == null) { background = defaultBackground(); } else { @@ -2253,7 +2253,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize return super.setBounds (x, y, width, newHeight, move, resize); } -void setButtonHandle (long /*int*/ widget) { +void setButtonHandle (long widget) { if (buttonHandle == widget) return; if (buttonHandle != 0) { display.removeWidget (buttonHandle); @@ -2267,7 +2267,7 @@ void setButtonHandle (long /*int*/ widget) { } } -void setMenuHandle (long /*int*/ widget) { +void setMenuHandle (long widget) { if (menuHandle == widget) return; if (menuHandle != 0) { display.removeWidget (menuHandle); @@ -2282,7 +2282,7 @@ void setMenuHandle (long /*int*/ widget) { } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); if (entryHandle != 0) setFontDescription (entryHandle, font); OS.g_object_set (textRenderer, OS.font_desc, font, 0); @@ -2321,7 +2321,7 @@ void setInitialBounds () { * first sized. The fix is to set the value to (0, 0) as * expected by SWT. */ - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation(); if ((parent.style & SWT.MIRRORED) != 0) { allocation.x = parent.getClientWidth (); @@ -2496,7 +2496,7 @@ public void setSelection (Point selection) { if (selection == null) error (SWT.ERROR_NULL_ARGUMENT); if ((style & SWT.READ_ONLY) != 0) return; if (entryHandle != 0) { - long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle); + long ptr = GTK.gtk_entry_get_text (entryHandle); 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); GTK.gtk_editable_set_position (entryHandle, start); @@ -2547,7 +2547,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)) { - long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle); + long ptr = GTK.gtk_entry_get_text (entryHandle); string = verifyText (string, 0, (int)/*64*/OS.g_utf16_strlen (ptr, -1)); if (string == null) return; } @@ -2625,15 +2625,15 @@ boolean checkSubwindow () { } @Override -boolean translateTraversal (long /*int*/ event) { +boolean translateTraversal (long event) { int [] key = new int[1]; GDK.gdk_event_get_keyval(event, key); switch (key[0]) { case GDK.GDK_KP_Enter: case GDK.GDK_Return: { - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { - long /*int*/ [] preeditString = new long /*int*/ [1]; + long [] preeditString = new long [1]; GTK.gtk_im_context_get_preedit_string (imContext, preeditString, null, null); if (preeditString [0] != 0) { int length = C.strlen (preeditString [0]); @@ -2652,7 +2652,7 @@ String verifyText (String string, int start, int end) { event.text = string; event.start = start; event.end = end; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int type = GDK.gdk_event_get_event_type(eventPtr); type = fixGdkEventTypeValues(type); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java index a5e1b6e21f..3ee0242de6 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java @@ -65,8 +65,8 @@ public class Composite extends Scrollable { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ embeddedHandle; - long /*int*/ imHandle, socketHandle; + public long embeddedHandle; + long imHandle, socketHandle; Layout layout; Control[] tabList; int layoutCount, backgroundMode; @@ -75,7 +75,7 @@ public class Composite extends Scrollable { * needs to have its clip set to its allocation. This is because on GTK3.20+ * some widgets (like Combo) have their clips merged with that of their parent. */ - long /*int*/ fixClipHandle; + long fixClipHandle; /** * If fixClipHandle is set, then the fixClipMap HashMap contains children * of fixClipHandle that also need to have their clips adjusted. @@ -85,7 +85,7 @@ public class Composite extends Scrollable { * This array will be traversed in-order to adjust the clipping of each element. * See bug 500703 and 535323.

*/ - Map fixClipMap = new HashMap<> (); + Map fixClipMap = new HashMap<> (); static final String NO_INPUT_METHOD = "org.eclipse.swt.internal.gtk.noInputMethod"; //$NON-NLS-1$ Shell popupChild; @@ -160,15 +160,15 @@ static int checkStyle (int style) { } Control [] _getChildren () { - long /*int*/ parentHandle = parentingHandle (); - long /*int*/ list = GTK.gtk_container_get_children (parentHandle); + long parentHandle = parentingHandle (); + long list = GTK.gtk_container_get_children (parentHandle); if (list == 0) return new Control [0]; int count = OS.g_list_length (list); Control [] children = new Control [count]; int i = 0; - long /*int*/ temp = list; + long temp = list; while (temp != 0) { - long /*int*/ handle = OS.g_list_data (temp); + long handle = OS.g_list_data (temp); if (handle != 0) { Widget widget = display.getWidget (handle); if (widget != null && widget != this) { @@ -305,9 +305,9 @@ void createHandle (int index, boolean fixed, boolean scrolled) { if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); gtk_widget_set_has_surface_or_window (fixedHandle, true); } - long /*int*/ vadj = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10); + long vadj = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10); if (vadj == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ hadj = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10); + long hadj = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10); if (hadj == 0) error (SWT.ERROR_NO_HANDLES); scrolledHandle = GTK.gtk_scrolled_window_new (hadj, vadj); if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES); @@ -389,8 +389,8 @@ void fixClippings () { Control [] children = _getChildren(); for (Control child : children) { if (fixClipMap.containsKey(child)) { - long /*int*/ [] childHandles = fixClipMap.get(child); - for (long /*int*/ widget : childHandles) { + long [] childHandles = fixClipMap.get(child); + for (long widget : childHandles) { child.adjustChildClipping(widget); } } @@ -399,7 +399,7 @@ void fixClippings () { } @Override -void adjustChildClipping (long /*int*/ widget) { +void adjustChildClipping (long widget) { GtkRequisition minimumSize = new GtkRequisition (); GtkRequisition naturalSize = new GtkRequisition (); GtkAllocation clip = new GtkAllocation (); @@ -436,9 +436,9 @@ void adjustChildClipping (long /*int*/ widget) { } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { - long /*int*/ context = GTK.gtk_widget_get_style_context(widget); + long context = GTK.gtk_widget_get_style_context(widget); GtkAllocation allocation = new GtkAllocation(); GTK.gtk_widget_get_allocation (widget, allocation); int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width; @@ -512,17 +512,17 @@ void drawBackgroundInPixels (GC gc, int x, int y, int width, int height, int off Control control = findBackgroundControl (); if (control != null) { GCData data = gc.getGCData (); - long /*int*/ cairo = data.cairo; + long cairo = data.cairo; Cairo.cairo_save (cairo); if (control.backgroundImage != null) { Point pt = display.mapInPixels (this, control, 0, 0); Cairo.cairo_translate (cairo, -pt.x - offsetX, -pt.y - offsetY); x += pt.x + offsetX; y += pt.y + offsetY; - long /*int*/ surface = control.backgroundImage.surface; + long surface = control.backgroundImage.surface; if (surface == 0) error (SWT.ERROR_NO_HANDLES); Cairo.cairo_surface_reference(surface); - long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (surface); + long pattern = Cairo.cairo_pattern_create_for_surface (surface); if (pattern == 0) error (SWT.ERROR_NO_HANDLES); Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT); if ((data.style & SWT.MIRRORED) != 0) { @@ -592,7 +592,7 @@ void fixParentGdkResource() { } @Override -void fixModal(long /*int*/ group, long /*int*/ modalGroup) { +void fixModal(long group, long modalGroup) { Control[] controls = _getChildren (); for (int i = 0; i < controls.length; i++) { controls[i].fixModal (group, modalGroup); @@ -632,16 +632,16 @@ void fixTabList (Control control) { void fixZOrder () { if ((state & CANVAS) != 0) return; - long /*int*/ parentHandle = parentingHandle (); + long parentHandle = parentingHandle (); if (GTK.GTK4) { - long /*int*/ parentSurface = gtk_widget_get_surface (parentHandle); + long parentSurface = gtk_widget_get_surface (parentHandle); if (parentSurface == 0) return; - long /*int*/ [] userData = new long /*int*/ [1]; - long /*int*/ surfaceList = GDK.gdk_surface_get_children (parentSurface); + long [] userData = new long [1]; + long surfaceList = GDK.gdk_surface_get_children (parentSurface); if (surfaceList != 0) { - long /*int*/ surfaces = surfaceList; + long surfaces = surfaceList; while (surfaces != 0) { - long /*int*/ surface = OS.g_list_data (surfaces); + long surface = OS.g_list_data (surfaces); if (surface != redrawSurface) { GDK.gdk_surface_get_user_data (surface, userData); if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) { @@ -653,14 +653,14 @@ void fixZOrder () { OS.g_list_free (surfaceList); } } else { - long /*int*/ parentWindow = gtk_widget_get_window (parentHandle); + long parentWindow = gtk_widget_get_window (parentHandle); if (parentWindow == 0) return; - long /*int*/ [] userData = new long /*int*/ [1]; - long /*int*/ windowList = GDK.gdk_window_get_children (parentWindow); + long [] userData = new long [1]; + long windowList = GDK.gdk_window_get_children (parentWindow); if (windowList != 0) { - long /*int*/ windows = windowList; + long windows = windowList; while (windows != 0) { - long /*int*/ window = OS.g_list_data (windows); + long window = OS.g_list_data (windows); if (window != redrawWindow) { GDK.gdk_window_get_user_data (window, userData); if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) { @@ -675,13 +675,13 @@ void fixZOrder () { } @Override -long /*int*/ focusHandle () { +long focusHandle () { if (socketHandle != 0) return socketHandle; return super.focusHandle (); } @Override -boolean forceFocus (long /*int*/ focusHandle) { +boolean forceFocus (long focusHandle) { if (socketHandle != 0) GTK.gtk_widget_set_can_focus (focusHandle, true); boolean result = super.forceFocus (focusHandle); if (socketHandle != 0) GTK.gtk_widget_set_can_focus (focusHandle, false); @@ -742,7 +742,7 @@ int getChildrenCount () { * NOTE: The current implementation will count * non-registered children. */ - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return 0; int count = OS.g_list_length (list); OS.g_list_free (list); @@ -757,7 +757,7 @@ Rectangle getClientAreaInPixels () { return new Rectangle (0, 0, 0, 0); } forceResize (); - long /*int*/ clientHandle = clientHandle (); + long clientHandle = clientHandle (); GtkAllocation allocation = new GtkAllocation(); GTK.gtk_widget_get_allocation (clientHandle, allocation); int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width; @@ -837,8 +837,8 @@ public Control [] getTabList () { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_button_press_event (widget, event); +long gtk_button_press_event (long widget, long event) { + long result = super.gtk_button_press_event (widget, event); if (result != 0) return result; if ((state & CANVAS) != 0) { if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) { @@ -853,8 +853,8 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_key_press_event (widget, event); +long gtk_key_press_event (long widget, long event) { + long result = super.gtk_key_press_event (widget, event); if (result != 0) return result; /* * Feature in GTK. The default behavior when the return key @@ -874,36 +874,36 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { +long gtk_focus (long widget, long directionType) { if (widget == socketHandle) return 0; return super.gtk_focus (widget, directionType); } @Override -long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_focus_in_event (widget, event); +long gtk_focus_in_event (long widget, long event) { + long result = super.gtk_focus_in_event (widget, event); return (state & CANVAS) != 0 ? 1 : result; } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_focus_out_event (widget, event); +long gtk_focus_out_event (long widget, long event) { + long result = super.gtk_focus_out_event (widget, event); return (state & CANVAS) != 0 ? 1 : result; } @Override -long /*int*/ gtk_map (long /*int*/ widget) { +long gtk_map (long widget) { fixZOrder (); return 0; } @Override -long /*int*/ gtk_realize (long /*int*/ widget) { - long /*int*/ result = super.gtk_realize (widget); +long gtk_realize (long widget) { + long result = super.gtk_realize (widget); if ((style & SWT.NO_BACKGROUND) != 0) { // No gdk_surface_set_background_pattern() on GTK4. if (GTK.GTK_VERSION < OS.VERSION(3, 22, 0)) { - long /*int*/ window = gtk_widget_get_window (paintHandle ()); + long window = gtk_widget_get_window (paintHandle ()); if (window != 0) { GDK.gdk_window_set_background_pattern(window, 0); } @@ -916,15 +916,15 @@ long /*int*/ gtk_realize (long /*int*/ widget) { } @Override -long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) { +long gtk_scroll_child (long widget, long scrollType, long horizontal) { /* Stop GTK scroll child signal for canvas */ OS.g_signal_stop_emission_by_name (widget, OS.scroll_child); return 1; } @Override -long /*int*/ gtk_style_updated (long /*int*/ widget) { - long /*int*/ result = super.gtk_style_updated (widget); +long gtk_style_updated (long widget) { + long result = super.gtk_style_updated (widget); if ((style & SWT.NO_BACKGROUND) != 0) { //TODO: implement this on GTK3 as pixmaps are gone. } @@ -951,7 +951,7 @@ boolean hooksKeys () { } @Override -long /*int*/ imHandle () { +long imHandle () { return imHandle; } @@ -1279,16 +1279,16 @@ void markLayout (boolean changed, boolean all) { } } -void moveAbove (long /*int*/ child, long /*int*/ sibling) { +void moveAbove (long child, long sibling) { if (child == sibling) return; - long /*int*/ parentHandle = parentingHandle (); + long parentHandle = parentingHandle (); OS.swt_fixed_restack (parentHandle, child, sibling, true); return; } -void moveBelow (long /*int*/ child, long /*int*/ sibling) { +void moveBelow (long child, long sibling) { if (child == sibling) return; - long /*int*/ parentHandle = parentingHandle (); + long parentHandle = parentingHandle (); if (sibling == 0 && parentHandle == fixedHandle) { moveAbove (child, scrolledHandle != 0 ? scrolledHandle : handle); return; @@ -1302,7 +1302,7 @@ void moveChildren(int oldWidth) { Control[] children = _getChildren (); for (int i = 0; i < children.length; i++) { Control child = children[i]; - long /*int*/ topHandle = child.topHandle (); + long topHandle = child.topHandle (); GtkAllocation allocation = new GtkAllocation(); GTK.gtk_widget_get_allocation (topHandle, allocation); int x = allocation.x; @@ -1358,13 +1358,13 @@ Point minimumSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } -long /*int*/ parentingHandle () { +long parentingHandle () { if ((state & CANVAS) != 0) return handle; return fixedHandle != 0 ? fixedHandle : handle; } @Override -void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) { +void printWidget (GC gc, long drawable, int depth, int x, int y) { Region oldClip = new Region (gc.getDevice ()); Region newClip = new Region (gc.getDevice ()); Point loc = DPIUtil.autoScaleDown(new Point (x, y)); @@ -1398,7 +1398,7 @@ void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) { * NOTE: only the "draw" (EXPOSE) signal is connected, not EXPOSE_EVENT_INVERSE. */ void connectFixedHandleDraw () { - long /*int*/ paintHandle = fixedHandle; + long paintHandle = fixedHandle; int paintMask = GDK.GDK_EXPOSURE_MASK; GTK.gtk_widget_add_events (paintHandle, paintMask); @@ -1419,12 +1419,12 @@ void connectFixedHandleDraw () { * @param container the parent container, i.e. fixedHandle * @param cairo the cairo context provided by GTK */ -void propagateDraw (long /*int*/ container, long /*int*/ cairo) { +void propagateDraw (long container, long cairo) { if (container == fixedHandle) { - long /*int*/ list = GTK.gtk_container_get_children (container); - long /*int*/ temp = list; + long list = GTK.gtk_container_get_children (container); + long temp = list; while (temp != 0) { - long /*int*/ child = OS.g_list_data (temp); + long child = OS.g_list_data (temp); if (child != 0) { Widget widget = display.getWidget (child); if (widget != this) { @@ -1439,13 +1439,13 @@ void propagateDraw (long /*int*/ container, long /*int*/ cairo) { GTK.gtk_widget_get_allocation(child, allocation); if ((allocation.y + allocation.height) < noChildDrawing.height) { if (!childLowered) { - long /*int*/ window = gtk_widget_get_window(child); + long window = gtk_widget_get_window(child); GDK.gdk_window_lower(window); childrenLowered.put(widget, true); } } else { if (childLowered) { - long /*int*/ window = gtk_widget_get_window(child); + long window = gtk_widget_get_window(child); GDK.gdk_window_raise(window); childrenLowered.put(widget, false); } @@ -1584,7 +1584,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize * but fix themselfes upon first resize by mouse, then * consider moving this fix higher into Control's setBound(...) method instead. */ - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); if (fixedHandle != 0 && handle != 0 && getVisible() && !GTK.gtk_widget_get_visible(topHandle) //if SWT State is not HIDDEN, but widget is hidden on GTK side. && topHandle == fixedHandle && width > 0 && height > 0 && resize) { @@ -1772,7 +1772,7 @@ boolean translateMnemonic (Event event, Control control) { } @Override -int traversalCode(int key, long /*int*/ event) { +int traversalCode(int key, long event) { if ((state & CANVAS) != 0) { if ((style & SWT.NO_FOCUS) != 0) return 0; if (hooksKeys ()) return 0; @@ -1781,7 +1781,7 @@ int traversalCode(int key, long /*int*/ event) { } @Override -boolean translateTraversal (long /*int*/ event) { +boolean translateTraversal (long event) { if (socketHandle != 0) return false; return super.translateTraversal (event); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index f6e8205c30..67587395de 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -50,24 +50,24 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public abstract class Control extends Widget implements Drawable { - long /*int*/ fixedHandle; - long /*int*/ redrawWindow, enableWindow, provider; - long /*int*/ redrawSurface, enableSurface; + long fixedHandle; + long redrawWindow, enableWindow, provider; + long redrawSurface, enableSurface; int drawCount, backgroundAlpha = 255; - long /*int*/ enterNotifyEventId; - long /*int*/ dragGesture, zoomGesture, rotateGesture, panGesture; + long enterNotifyEventId; + long dragGesture, zoomGesture, rotateGesture, panGesture; Composite parent; Cursor cursor; Menu menu; Image backgroundImage; Font font; Region region; - long /*int*/ eventRegion; + long eventRegion; /** * The handle to the Region, which is neccessary in the case * that region is disposed before this Control. */ - long /*int*/ regionHandle; + long regionHandle; String toolTipText; Object layoutData; Accessible accessible; @@ -160,9 +160,9 @@ public Control (Composite parent, int style) { } void connectPaint () { - long /*int*/ paintHandle = paintHandle (); + long paintHandle = paintHandle (); if (GTK.GTK4 && hooksPaint()) { - long /*int*/ widgetClass = GTK.GTK_WIDGET_GET_CLASS(paintHandle); + long widgetClass = GTK.GTK_WIDGET_GET_CLASS(paintHandle); GtkWidgetClass widgetClassStruct = new GtkWidgetClass (); OS.memmove(widgetClassStruct, widgetClass); widgetClassStruct.snapshot = display.snapshotDrawProc; @@ -187,20 +187,20 @@ GdkRGBA defaultBackground () { void deregister () { super.deregister (); if (fixedHandle != 0) display.removeWidget (fixedHandle); - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) display.removeWidget (imHandle); } -void drawBackground (Control control, long /*int*/ window, long /*int*/ region, int x, int y, int width, int height) { +void drawBackground (Control control, long window, long region, int x, int y, int width, int height) { drawBackground(control, window, 0, region, x, y, width, height); } -void drawBackground (Control control, long /*int*/ window, long /*int*/ cr, long /*int*/ region, int x, int y, int width, int height) { - long /*int*/ cairo = 0; - long /*int*/ context = 0; +void drawBackground (Control control, long window, long cr, long region, int x, int y, int width, int height) { + long cairo = 0; + long context = 0; if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { if (cr == 0) { - long /*int*/ cairo_region = region != 0 ? region: GDK.gdk_window_get_visible_region(window); + long cairo_region = region != 0 ? region: GDK.gdk_window_get_visible_region(window); context = GDK.gdk_window_begin_draw_frame(window, cairo_region); cairo = GDK.gdk_drawing_context_get_cairo_context(context); } else { @@ -225,7 +225,7 @@ void drawBackground (Control control, long /*int*/ gdkResource, long /*int*/ cr, Cairo.cairo_translate (cairo, -pt.x, -pt.y); x += pt.x; y += pt.y; - long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (control.backgroundImage.surface); + long pattern = Cairo.cairo_pattern_create_for_surface (control.backgroundImage.surface); if (pattern == 0) error (SWT.ERROR_NO_HANDLES); Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT); if ((style & SWT.MIRRORED) != 0) { @@ -247,11 +247,11 @@ void drawBackground (Control control, long /*int*/ gdkResource, long /*int*/ cr, } boolean drawGripper (GC gc, int x, int y, int width, int height, boolean vertical) { - long /*int*/ paintHandle = paintHandle (); - long /*int*/ gdkResource = GTK.GTK4? gtk_widget_get_surface(paintHandle) : gtk_widget_get_window (paintHandle); + long paintHandle = paintHandle (); + long gdkResource = GTK.GTK4? gtk_widget_get_surface(paintHandle) : gtk_widget_get_window (paintHandle); if (gdkResource == 0) return false; if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x; - long /*int*/ context = GTK.gtk_widget_get_style_context (paintHandle); + long context = GTK.gtk_widget_get_style_context (paintHandle); GTK.gtk_style_context_save (context); GTK.gtk_style_context_add_class (context, GTK.GTK_STYLE_CLASS_PANE_SEPARATOR); GTK.gtk_style_context_set_state (context, GTK.GTK_STATE_FLAG_NORMAL); @@ -267,22 +267,22 @@ void enableWidget (boolean enabled) { GTK.gtk_widget_set_sensitive (handle, enabled); } -long /*int*/ enterExitHandle () { +long enterExitHandle () { return eventHandle (); } -long /*int*/ eventHandle () { +long eventHandle () { return handle; } -long /*int*/ eventWindow () { - long /*int*/ eventHandle = eventHandle (); +long eventWindow () { + long eventHandle = eventHandle (); GTK.gtk_widget_realize (eventHandle); return gtk_widget_get_window (eventHandle); } -long /*int*/ eventSurface () { - long /*int*/ eventHandle = eventHandle (); +long eventSurface () { + long eventHandle = eventHandle (); GTK.gtk_widget_realize (eventHandle); return gtk_widget_get_surface (eventHandle); } @@ -319,7 +319,7 @@ void fixFocus (Control focusControl) { if (control.setFocus ()) return; } shell.setSavedFocus (focusControl); - long /*int*/ focusHandle = shell.vboxHandle; + long focusHandle = shell.vboxHandle; GTK.gtk_widget_set_can_focus (focusHandle, true); GTK.gtk_widget_grab_focus (focusHandle); // widget could be disposed at this point @@ -331,7 +331,7 @@ void fixStyle () { if (fixedHandle != 0) fixStyle (fixedHandle); } -void fixStyle (long /*int*/ handle) { +void fixStyle (long handle) { /* * Feature in GTK. Some GTK themes apply a different background to * the contents of a GtkNotebook. However, in an SWT TabFolder, the @@ -347,15 +347,15 @@ void fixStyle (long /*int*/ handle) { if ((state & THEME_BACKGROUND) == 0) return; } -long /*int*/ focusHandle () { +long focusHandle () { return handle; } -long /*int*/ fontHandle () { +long fontHandle () { return handle; } -long /*int*/ gestureHandle () { +long gestureHandle () { return handle; } @@ -403,22 +403,22 @@ boolean hasFocus () { @Override void hookEvents () { /* Connect the keyboard signals */ - long /*int*/ focusHandle = focusHandle (); + long focusHandle = focusHandle (); int focusMask = GDK.GDK_KEY_PRESS_MASK | GDK.GDK_KEY_RELEASE_MASK | GDK.GDK_FOCUS_CHANGE_MASK; if (GTK.GTK4) { - long /*int*/ keyController = GTK.gtk_event_controller_key_new(); + long keyController = GTK.gtk_event_controller_key_new(); GTK.gtk_widget_add_controller(focusHandle, keyController); GTK.gtk_event_controller_set_propagation_phase(keyController, GTK.GTK_PHASE_TARGET); - long /*int*/ keyPressReleaseAddress = display.keyPressReleaseCallback.getAddress(); - long /*int*/ focusAddress = display.focusCallback.getAddress(); + long keyPressReleaseAddress = display.keyPressReleaseCallback.getAddress(); + long focusAddress = display.focusCallback.getAddress(); OS.g_signal_connect (keyController, OS.key_pressed, keyPressReleaseAddress, KEY_PRESSED); OS.g_signal_connect (keyController, OS.key_released, keyPressReleaseAddress, KEY_RELEASED); OS.g_signal_connect (keyController, OS.focus_in, focusAddress, FOCUS_IN); OS.g_signal_connect (keyController, OS.focus_out, focusAddress, FOCUS_OUT); - long /*int*/ gesturePressReleaseAddress = display.gesturePressReleaseCallback.getAddress(); - long /*int*/ gestureMultiPress = GTK.gtk_gesture_multi_press_new(); + long gesturePressReleaseAddress = display.gesturePressReleaseCallback.getAddress(); + long gestureMultiPress = GTK.gtk_gesture_multi_press_new(); GTK.gtk_widget_add_controller(focusHandle, gestureMultiPress); OS.g_signal_connect(gestureMultiPress, OS.pressed, gesturePressReleaseAddress, GESTURE_PRESSED); OS.g_signal_connect(gestureMultiPress, OS.released, gesturePressReleaseAddress, GESTURE_RELEASED); @@ -435,27 +435,27 @@ void hookEvents () { OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS], 0, display.getClosure (FOCUS), false); /* Connect the mouse signals */ - long /*int*/ eventHandle = eventHandle (); - long /*int*/ blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle; - long /*int*/ enterExitHandle = enterExitHandle (); + long eventHandle = eventHandle (); + long blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle; + long enterExitHandle = enterExitHandle (); if (GTK.GTK4) { - long /*int*/ motionController = GTK.gtk_event_controller_motion_new(); + long motionController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(eventHandle, motionController); GTK.gtk_event_controller_set_propagation_phase(motionController, GTK.GTK_PHASE_BUBBLE); - long /*int*/ enterMotionScrollAddress = display.enterMotionScrollCallback.getAddress(); + long enterMotionScrollAddress = display.enterMotionScrollCallback.getAddress(); OS.g_signal_connect (motionController, OS.motion, enterMotionScrollAddress, MOTION); - long /*int*/ enterLeaveController; + long enterLeaveController; enterLeaveController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(enterExitHandle, enterLeaveController); GTK.gtk_event_controller_set_propagation_phase(enterLeaveController, GTK.GTK_PHASE_TARGET); - long /*int*/ leaveAddress = display.leaveCallback.getAddress(); + long leaveAddress = display.leaveCallback.getAddress(); OS.g_signal_connect (enterLeaveController, OS.leave, leaveAddress, LEAVE); OS.g_signal_connect (enterLeaveController, OS.enter, enterMotionScrollAddress, ENTER); - long /*int*/ motionInverseController; + long motionInverseController; if (blockHandle != eventHandle) { motionInverseController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(blockHandle, motionInverseController); @@ -465,7 +465,7 @@ void hookEvents () { } OS.g_signal_connect (motionInverseController, OS.motion, enterMotionScrollAddress, MOTION_INVERSE); - long /*int*/ scrollController = GTK.gtk_event_controller_scroll_new(GTK.GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES); + long scrollController = GTK.gtk_event_controller_scroll_new(GTK.GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES); GTK.gtk_widget_add_controller(eventHandle, scrollController); GTK.gtk_event_controller_set_propagation_phase(scrollController, GTK.GTK_PHASE_TARGET); OS.g_signal_connect (scrollController, OS.scroll, enterMotionScrollAddress, SCROLL); @@ -530,7 +530,7 @@ void hookEvents () { /* Connect the Input Method signals */ OS.g_signal_connect_closure_by_id (handle, display.signalIds [REALIZE], 0, display.getClosure (REALIZE), true); OS.g_signal_connect_closure_by_id (handle, display.signalIds [UNREALIZE], 0, display.getClosure (UNREALIZE), false); - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) { OS.g_signal_connect_closure (imHandle, OS.commit, display.getClosure (COMMIT), false); OS.g_signal_connect_closure (imHandle, OS.preedit_changed, display.getClosure (PREEDIT_CHANGED), false); @@ -538,7 +538,7 @@ void hookEvents () { OS.g_signal_connect_closure_by_id (paintHandle (), display.signalIds [STYLE_UPDATED], 0, display.getClosure (STYLE_UPDATED), false); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.getClosure (MAP), true); if (enterNotifyEventFunc == null && GTK.GTK_VERSION < OS.VERSION (3, 11, 9)) { @@ -559,7 +559,7 @@ boolean hooksPaint () { } @Override -long /*int*/ hoverProc (long /*int*/ widget) { +long hoverProc (long widget) { int [] x = new int [1], y = new int [1], mask = new int [1]; if (GTK.GTK4) { /* @@ -577,15 +577,15 @@ long /*int*/ hoverProc (long /*int*/ widget) { } @Override -long /*int*/ topHandle() { +long topHandle() { if (fixedHandle != 0) return fixedHandle; return super.topHandle (); } -long /*int*/ paintHandle () { - long /*int*/ topHandle = topHandle (); +long paintHandle () { + long topHandle = topHandle (); if (GTK.GTK4) return topHandle; - long /*int*/ paintHandle = handle; + long paintHandle = handle; while (paintHandle != topHandle) { if (gtk_widget_get_has_surface_or_window (paintHandle)) break; paintHandle = GTK.gtk_widget_get_parent (paintHandle); @@ -594,8 +594,8 @@ long /*int*/ paintHandle () { } @Override -long /*int*/ paintWindow () { - long /*int*/ paintHandle = paintHandle (); +long paintWindow () { + long paintHandle = paintHandle (); GTK.gtk_widget_realize (paintHandle); if (GTK.GTK4) { return gtk_widget_get_surface (paintHandle); @@ -605,8 +605,8 @@ long /*int*/ paintWindow () { } @Override -long /*int*/ paintSurface () { - long /*int*/ paintHandle = paintHandle (); +long paintSurface () { + long paintHandle = paintHandle (); GTK.gtk_widget_realize (paintHandle); return gtk_widget_get_surface (paintHandle); } @@ -632,7 +632,7 @@ public boolean print (GC gc) { checkWidget (); if (gc == null) error (SWT.ERROR_NULL_ARGUMENT); if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GTK.gtk_widget_realize (topHandle); /* * Feature in GTK: gtk_widget_draw() will only draw if the @@ -651,16 +651,16 @@ public boolean print (GC gc) { return true; } -void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) { +void printWidget (GC gc, long drawable, int depth, int x, int y) { boolean obscured = (state & OBSCURED) != 0; state &= ~OBSCURED; - long /*int*/ topHandle = topHandle (); - long /*int*/ gdkResource = GTK.GTK4 ? gtk_widget_get_surface(topHandle) : gtk_widget_get_window (topHandle); + long topHandle = topHandle (); + long gdkResource = GTK.GTK4 ? gtk_widget_get_surface(topHandle) : gtk_widget_get_window (topHandle); printWindow (true, this, gc, drawable, depth, gdkResource, x, y); if (obscured) state |= OBSCURED; } -void printWindow (boolean first, Control control, GC gc, long /*int*/ drawable, int depth, long /*int*/ window, int x, int y) { +void printWindow (boolean first, Control control, GC gc, long drawable, int depth, long window, int x, int y) { /* * TODO: this needs to be re-implemented for GTK3 as it uses GdkDrawable which is gone. * See: https://developer.gnome.org/gtk3/stable/ch26s02.html#id-1.6.3.4.7 @@ -864,7 +864,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { return computeNativeSize (handle, wHint, hHint, changed); } -Point computeNativeSize (long /*int*/ h, int wHint, int hHint, boolean changed) { +Point computeNativeSize (long h, int wHint, int hHint, boolean changed) { int width = wHint, height = hHint; if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) { GtkRequisition requisition = new GtkRequisition (); @@ -898,7 +898,7 @@ void forceResize () { * topHandle. Note that all calls to gtk_widget_size_allocate() * must be preceded by a call to gtk_widget_size_request(). */ - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkRequisition requisition = new GtkRequisition (); gtk_widget_get_preferred_size (topHandle, requisition); GtkAllocation allocation = new GtkAllocation (); @@ -962,7 +962,7 @@ public Rectangle getBounds () { Rectangle getBoundsInPixels () { checkWidget(); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); int x = allocation.x; @@ -1053,13 +1053,13 @@ void markLayout (boolean changed, boolean all) { } void moveHandle (int x, int y) { - long /*int*/ topHandle = topHandle (); - long /*int*/ parentHandle = parent.parentingHandle (); + long topHandle = topHandle (); + long parentHandle = parent.parentingHandle (); OS.swt_fixed_move (parentHandle, topHandle, x, y); } void resizeHandle (int width, int height) { - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); OS.swt_fixed_resize (GTK.gtk_widget_get_parent (topHandle), topHandle, width, height); if (topHandle != handle) { Point sizes = resizeCalculationsGTK3 (handle, width, height); @@ -1069,7 +1069,7 @@ void resizeHandle (int width, int height) { } } -Point resizeCalculationsGTK3 (long /*int*/ widget, int width, int height) { +Point resizeCalculationsGTK3 (long widget, int width, int height) { Point sizes = new Point (width, height); /* * Feature in GTK3.20+: size calculations take into account GtkCSSNode @@ -1097,7 +1097,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize width = Math.min(width, (2 << 14) - 1); height = Math.min(height, (2 << 14) - 1); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); boolean sendMove = move; GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); @@ -1286,7 +1286,7 @@ public Point getLocation () { Point getLocationInPixels () { checkWidget(); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); int x = allocation.x; @@ -1371,7 +1371,7 @@ public Point getSize () { Point getSizeInPixels () { checkWidget(); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width; @@ -1435,9 +1435,9 @@ void setSizeInPixels (Point size) { public void setRegion (Region region) { checkWidget (); if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ shape_region = (region == null) ? 0 : region.handle; + long shape_region = (region == null) ? 0 : region.handle; this.region = region; - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); if (OS.G_OBJECT_TYPE(topHandle) == GTK.GTK_TYPE_WINDOW()) { GTK.gtk_widget_shape_combine_region(topHandle, shape_region); @@ -1464,8 +1464,8 @@ public void setRegion (Region region) { } void setRelations () { - long /*int*/ parentHandle = parent.parentingHandle (); - long /*int*/ list = GTK.gtk_container_get_children (parentHandle); + long parentHandle = parent.parentingHandle (); + long list = GTK.gtk_container_get_children (parentHandle); if (list == 0) return; int count = OS.g_list_length (list); if (count > 1) { @@ -1473,7 +1473,7 @@ void setRelations () { * the receiver is the last item in the list, so its predecessor will * be the second-last item in the list */ - long /*int*/ handle = OS.g_list_nth_data (list, count - 2); + long handle = OS.g_list_nth_data (list, count - 2); if (handle != 0) { Widget widget = display.getWidget (handle); if (widget != null && widget != this) { @@ -1533,7 +1533,7 @@ boolean isDescribedByLabel () { return true; } -boolean isFocusHandle (long /*int*/ widget) { +boolean isFocusHandle (long widget) { return widget == focusHandle (); } @@ -1680,10 +1680,10 @@ public Point toControl (int x, int y) { checkWidget (); int [] origin_x = new int [1], origin_y = new int [1]; if (GTK.GTK4) { - long /*int*/ surface = eventSurface (); + long surface = eventSurface (); GDK.gdk_surface_get_origin (surface, origin_x, origin_y); } else { - long /*int*/ window = eventWindow (); + long window = eventWindow (); GDK.gdk_window_get_origin (window, origin_x, origin_y); } x -= DPIUtil.autoScaleDown (origin_x [0]); @@ -1742,10 +1742,10 @@ public Point toDisplay (int x, int y) { checkWidget(); int [] origin_x = new int [1], origin_y = new int [1]; if (GTK.GTK4) { - long /*int*/ surface = eventSurface (); + long surface = eventSurface (); GDK.gdk_surface_get_origin (surface, origin_x, origin_y); } else { - long /*int*/ window = eventWindow (); + long window = eventWindow (); GDK.gdk_window_get_origin (window, origin_x, origin_y); } if ((style & SWT.MIRRORED) != 0) x = DPIUtil.autoScaleDown (getClientWidth ()) - x; @@ -1758,10 +1758,10 @@ Point toDisplayInPixels (int x, int y) { checkWidget(); int [] origin_x = new int [1], origin_y = new int [1]; if (GTK.GTK4) { - long /*int*/ surface = eventSurface (); + long surface = eventSurface (); GDK.gdk_surface_get_origin (surface, origin_x, origin_y); } else { - long /*int*/ window = eventWindow (); + long window = eventWindow (); GDK.gdk_window_get_origin (window, origin_x, origin_y); } if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x; @@ -2157,7 +2157,7 @@ public void addPaintListener(PaintListener listener) { * * @param widget the handle to the widget */ -void adjustChildClipping (long /*int*/ widget) { +void adjustChildClipping (long widget) { } void addRelation (Control control) { @@ -2720,7 +2720,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean startPos = display.getCursorLocationInPixels(); while (!quit) { - long /*int*/ eventPtr = 0; + long eventPtr = 0; /* * There should be an event on the queue already, but * in cases where there isn't one, stop trying after @@ -2748,7 +2748,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean case GDK.GDK_MOTION_NOTIFY: { int [] state = new int[1]; GDK.gdk_event_get_state(eventPtr, state); - long /*int*/ gdkResource = gdk_event_get_surface_or_window(eventPtr); + long gdkResource = gdk_event_get_surface_or_window(eventPtr); double [] eventX = new double[1]; double [] eventY = new double[1]; GDK.gdk_event_get_coords(eventPtr, eventX, eventY); @@ -2797,8 +2797,8 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean return dragging; } -boolean filterKey (int keyval, long /*int*/ event) { - long /*int*/ imHandle = imHandle (); +boolean filterKey (int keyval, long event) { + long imHandle = imHandle (); if (imHandle != 0) { return GTK.gtk_im_context_filter_keypress (imHandle, event); } @@ -2845,11 +2845,11 @@ void fixParentGdkResource() { * @param control that should be reparented. * @param newParentHandle pointer/handle to the new GtkWidget parent. */ -static void gtk_widget_reparent (Control control, long /*int*/ newParentHandle) { +static void gtk_widget_reparent (Control control, long newParentHandle) { // Changes to this method should be verified via both parts in: // org.eclipse.swt.tests.gtk/*/Bug510803_TabFolder_TreeEditor_Regression.java - long /*int*/ widget = control.topHandle(); - long /*int*/ parentContainer = GTK.gtk_widget_get_parent (widget); + long widget = control.topHandle(); + long parentContainer = GTK.gtk_widget_get_parent (widget); assert parentContainer != 0 : "Improper use of Control.gtk_widget_reparent. Widget currently has no parent."; if (parentContainer != 0) { @@ -2875,7 +2875,7 @@ static void gtk_widget_reparent (Control control, long /*int*/ newParentHandle) } } -void fixModal(long /*int*/ group, long /*int*/ modalGroup) { +void fixModal(long group, long modalGroup) { } /** @@ -2901,7 +2901,7 @@ public boolean forceFocus () { return forceFocus (focusHandle ()); } -boolean forceFocus (long /*int*/ focusHandle) { +boolean forceFocus (long focusHandle) { if (GTK.gtk_widget_has_focus (focusHandle)) return true; /* When the control is zero sized it must be realized */ GTK.gtk_widget_realize (focusHandle); @@ -2909,8 +2909,8 @@ boolean forceFocus (long /*int*/ focusHandle) { // widget could be disposed at this point if (isDisposed ()) return false; Shell shell = getShell (); - long /*int*/ shellHandle = shell.shellHandle; - long /*int*/ handle = GTK.gtk_window_get_focus (shellHandle); + long shellHandle = shell.shellHandle; + long handle = GTK.gtk_window_get_focus (shellHandle); while (handle != 0) { if (handle == focusHandle) { /* Cancel any previous ignoreFocus requests */ @@ -2977,7 +2977,7 @@ public Image getBackgroundImage () { } GdkRGBA getContextBackgroundGdkRGBA () { - long /*int*/ fontHandle = fontHandle (); + long fontHandle = fontHandle (); if ((state & BACKGROUND) == 0) { return defaultBackground(); } @@ -2988,7 +2988,7 @@ GdkRGBA getContextBackgroundGdkRGBA () { return defaultBackground(); } } else { - long /*int*/ context = GTK.gtk_widget_get_style_context (fontHandle); + long context = GTK.gtk_widget_get_style_context (fontHandle); GdkRGBA rgba = new GdkRGBA (); GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba); return rgba; @@ -2996,11 +2996,11 @@ GdkRGBA getContextBackgroundGdkRGBA () { } GdkRGBA getContextColorGdkRGBA () { - long /*int*/ fontHandle = fontHandle (); + long fontHandle = fontHandle (); if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { return display.gtk_css_parse_foreground(display.gtk_css_provider_to_string(provider), null); } else { - long /*int*/ context = GTK.gtk_widget_get_style_context (fontHandle); + long context = GTK.gtk_widget_get_style_context (fontHandle); GdkRGBA rgba = display.styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL); return rgba; } @@ -3114,10 +3114,10 @@ public Font getFont () { return font != null ? font : defaultFont (); } -long /*int*/ getFontDescription () { - long /*int*/ fontHandle = fontHandle (); - long /*int*/ [] fontDesc = new long /*int*/ [1]; - long /*int*/ context = GTK.gtk_widget_get_style_context (fontHandle); +long getFontDescription () { + long fontHandle = fontHandle (); + long [] fontDesc = new long [1]; + long context = GTK.gtk_widget_get_style_context (fontHandle); if ("ppc64le".equals(System.getProperty("os.arch"))) { return GTK.gtk_style_context_get_font(context, GTK.GTK_STATE_FLAG_NORMAL); } else if (GTK.GTK4) { @@ -3211,15 +3211,15 @@ public Monitor getMonitor () { checkWidget (); Monitor[] monitors = display.getMonitors (); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default (); + long display = GDK.gdk_display_get_default (); if (display != 0) { - long /*int*/ monitor; + long monitor; if (GTK.GTK4) { monitor = GDK.gdk_display_get_monitor_at_surface(display, paintSurface ()); } else { monitor = GDK.gdk_display_get_monitor_at_window(display, paintWindow ()); } - long /*int*/ toCompare; + long toCompare; for (int i = 0; i < monitors.length; i++) { toCompare = GDK.gdk_display_get_monitor(display, i); if (toCompare == monitor) { @@ -3228,7 +3228,7 @@ public Monitor getMonitor () { } } } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); if (screen != 0) { int monitorNumber = GDK.gdk_screen_get_monitor_at_window (screen, paintWindow ()); if (monitorNumber >= 0 && monitorNumber < monitors.length) { @@ -3378,10 +3378,10 @@ public boolean getVisible () { return (state & HIDDEN) == 0; } -Point getThickness (long /*int*/ widget) { +Point getThickness (long widget) { int xthickness = 0, ythickness = 0; GtkBorder tmp = new GtkBorder(); - long /*int*/ context = GTK.gtk_widget_get_style_context (widget); + long context = GTK.gtk_widget_get_style_context (widget); int state_flag = GTK.GTK_VERSION < OS.VERSION(3, 18, 0) ? GTK.GTK_STATE_FLAG_NORMAL : GTK.gtk_widget_get_state_flags(widget); gtk_style_context_get_padding(context, state_flag, tmp); GTK.gtk_style_context_save (context); @@ -3396,7 +3396,7 @@ Point getThickness (long /*int*/ widget) { return new Point (xthickness, ythickness); } -void gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder padding) { +void gtk_style_context_get_padding(long context, int state, GtkBorder padding) { if (GTK.GTK4) { GTK.gtk_style_context_get_padding(context, padding); } else { @@ -3404,7 +3404,7 @@ void gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder pa } } -void gtk_style_context_get_border (long /*int*/ context, int state, GtkBorder padding) { +void gtk_style_context_get_border (long context, int state, GtkBorder padding) { if (GTK.GTK4) { GTK.gtk_style_context_get_border(context, padding); } else { @@ -3418,7 +3418,7 @@ void gtk_style_context_get_border (long /*int*/ context, int state, GtkBorder pa * - button-release-event */ @Override -long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { +long gtk_event (long widget, long event) { if (!GTK.GTK4) return 0; int eventType = GDK.gdk_event_get_event_type(event); switch (eventType) { @@ -3446,7 +3446,7 @@ long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { * Handling multi-press event on GTK4 */ @Override -long /*int*/ gtk_gesture_press_event (long /*int*/ gesture, int n_press, double x, double y, long /*int*/ event) { +long gtk_gesture_press_event (long gesture, int n_press, double x, double y, long event) { if (n_press == 1) return 0; mouseDown = true; dragBegun = false; @@ -3479,7 +3479,7 @@ long /*int*/ gtk_gesture_press_event (long /*int*/ gesture, int n_press, double shell.forceActive(); } - long /*int*/ result = 0; + long result = 0; // Only send DoubleClick event as regular click is handled by generic gtk_event if (n_press == 2) { display.clickCount = 2; @@ -3490,7 +3490,7 @@ long /*int*/ gtk_gesture_press_event (long /*int*/ gesture, int n_press, double } @Override -long /*int*/ gtk_gesture_release_event (long /*int*/ gesture, int n_press, double x, double y, long /*int*/ event) { +long gtk_gesture_release_event (long gesture, int n_press, double x, double y, long event) { if (n_press == 1) return 0; mouseDown = false; @@ -3514,11 +3514,11 @@ long /*int*/ gtk_gesture_release_event (long /*int*/ gesture, int n_press, doubl } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { return gtk_button_press_event (widget, event, true); } -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event, boolean sendMouseDown) { +long gtk_button_press_event (long widget, long event, boolean sendMouseDown) { mouseDown = true; dragBegun = false; @@ -3540,12 +3540,12 @@ if (((shell.style & SWT.ON_TOP) != 0) && (((shell.style & SWT.NO_FOCUS) == 0) || ((style & SWT.NO_FOCUS) == 0))) { shell.forceActive(); } - long /*int*/ result = 0; + long result = 0; if (eventType == GDK.GDK_BUTTON_PRESS) { boolean dragging = false; display.clickCount = 1; - long /*int*/ defaultDisplay = GDK.gdk_display_get_default(); - long /*int*/ nextEvent = GTK.GTK4 ? GDK.gdk_display_peek_event(defaultDisplay) : GDK.gdk_event_peek (); + long defaultDisplay = GDK.gdk_display_get_default(); + long nextEvent = GTK.GTK4 ? GDK.gdk_display_peek_event(defaultDisplay) : GDK.gdk_event_peek (); if (nextEvent != 0) { int peekedEventType = GDK.GDK_EVENT_TYPE (nextEvent); if (peekedEventType == GDK.GDK_2BUTTON_PRESS) display.clickCount = 2; @@ -3616,7 +3616,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event, bo } @Override -long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_release_event (long widget, long event) { mouseDown = false; // Event fields double [] eventX = new double [1]; @@ -3638,7 +3638,7 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) } @Override -long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) { +long gtk_commit (long imcontext, long text) { if (text == 0) return 0; int length = C.strlen (text); if (length == 0) return 0; @@ -3650,7 +3650,7 @@ long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) { } @Override -long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_enter_notify_event (long widget, long event) { /* * Feature in GTK. Children of a shell will inherit and display the shell's * tooltip if they do not have a tooltip of their own. The fix is to use the @@ -3662,12 +3662,12 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { char [] chars = fixMnemonic (toolTipText, false, true); buffer = Converter.wcsToMbcs (chars, true); } - long /*int*/ toolHandle = getShell().handle; + long toolHandle = getShell().handle; GTK.gtk_widget_set_tooltip_text (toolHandle, buffer); if (display.currentControl == this) return 0; GdkEventCrossing gdkEvent = new GdkEventCrossing (); - long /*int*/ childGdkResource = 0; + long childGdkResource = 0; int [] crossingMode = new int[1]; int [] state = new int [1]; GDK.gdk_event_get_state(event, state); @@ -3716,7 +3716,7 @@ boolean checkSubwindow () { } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { +long gtk_event_after (long widget, long gdkEvent) { int eventType = GDK.gdk_event_get_event_type(gdkEvent); eventType = fixGdkEventTypeValues(eventType); switch (eventType) { @@ -3767,7 +3767,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { } } else { display.ignoreFocus = false; - long /*int*/ grabHandle = GTK.gtk_grab_get_current (); + long grabHandle = GTK.gtk_grab_get_current (); if (grabHandle != 0) { if (OS.G_OBJECT_TYPE (grabHandle) == GTK.GTK_TYPE_MENU ()) { display.ignoreFocus = true; @@ -3806,10 +3806,10 @@ void cairoDisposeRegion () { * * @param cairo the cairo context to apply the region to */ -void cairoClipRegion (long /*int*/ cairo) { +void cairoClipRegion (long cairo) { GdkRectangle rect = new GdkRectangle (); GDK.gdk_cairo_get_clip_rectangle (cairo, rect); - long /*int*/ regionHandle = this.regionHandle; + long regionHandle = this.regionHandle; // Disposal check just in case if (regionHandle == 0) { drawRegion = false; @@ -3821,7 +3821,7 @@ void cairoClipRegion (long /*int*/ cairo) { */ cairo_rectangle_int_t cairoRect = new cairo_rectangle_int_t(); cairoRect.convertFromGdkRectangle(rect); - long /*int*/ actualRegion = Cairo.cairo_region_create_rectangle(cairoRect); + long actualRegion = Cairo.cairo_region_create_rectangle(cairoRect); Cairo.cairo_region_subtract(actualRegion, regionHandle); // Draw the Shell bg using cairo, only if it's a different color Shell shell = getShell(); @@ -3839,7 +3839,7 @@ void cairoClipRegion (long /*int*/ cairo) { } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if ((state & OBSCURED) != 0) return 0; GdkRectangle rect = new GdkRectangle (); GDK.gdk_cairo_get_clip_rectangle (cairo, rect); @@ -3878,24 +3878,24 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { } @Override -long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { +long gtk_focus (long widget, long directionType) { /* Stop GTK traversal for every widget */ return 1; } @Override -long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_in_event (long widget, long event) { // widget could be disposed at this point if (handle != 0) { Control oldControl = display.imControl; if (oldControl != this) { if (oldControl != null && !oldControl.isDisposed ()) { - long /*int*/ oldIMHandle = oldControl.imHandle (); + long oldIMHandle = oldControl.imHandle (); if (oldIMHandle != 0) GTK.gtk_im_context_reset (oldIMHandle); } } if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) { - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) GTK.gtk_im_context_focus_in (imHandle); } } @@ -3903,11 +3903,11 @@ long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { // widget could be disposed at this point if (handle != 0) { if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) { - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) { GTK.gtk_im_context_focus_out (imHandle); } @@ -3917,7 +3917,7 @@ long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_press_event (long widget, long event) { int [] eventKeyval = new int [1]; GDK.gdk_event_get_keyval(event, eventKeyval); if (!hasFocus ()) { @@ -3947,9 +3947,9 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_release_event (long widget, long event) { if (!hasFocus ()) return 0; - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) { if (GTK.gtk_im_context_filter_keypress (imHandle, event)) return 1; } @@ -3957,7 +3957,7 @@ long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_leave_notify_event (long widget, long event) { if (display.currentControl != this) return 0; GdkEventCrossing gdkEvent = new GdkEventCrossing (); int [] crossingMode = new int[1]; @@ -3991,15 +3991,15 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) { +long gtk_mnemonic_activate (long widget, long arg1) { int result = 0; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int type = GDK.gdk_event_get_event_type(eventPtr); type = fixGdkEventTypeValues(type); if (type == GDK.GDK_KEY_PRESS) { Control focusControl = display.getFocusControl (); - long /*int*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0; + long focusHandle = focusControl != null ? focusControl.focusHandle () : 0; if (focusHandle != 0) { display.mnemonicControl = this; GTK.gtk_widget_event (focusHandle, eventPtr); @@ -4013,7 +4013,7 @@ long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) { } @Override -long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_motion_notify_event (long widget, long event) { if (mouseDown) { dragBegun = true; } @@ -4067,7 +4067,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { state[0] = gdkEvent.state; if (gdkEvent.is_hint != 0) { int [] pointer_x = new int [1], pointer_y = new int [1], mask = new int [1]; - long /*int*/ window = eventWindow (); + long window = eventWindow (); display.gdk_window_get_device_position (window, pointer_x, pointer_y, mask); x = pointer_x [0]; y = pointer_y [0]; @@ -4093,7 +4093,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_popup_menu (long /*int*/ widget) { +long gtk_popup_menu (long widget) { if (!hasFocus()) return 0; int [] x = new int [1], y = new int [1]; if (GTK.GTK4) { @@ -4109,17 +4109,17 @@ long /*int*/ gtk_popup_menu (long /*int*/ widget) { } @Override -long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { +long gtk_preedit_changed (long imcontext) { display.showIMWindow (this); return 0; } @Override -long /*int*/ gtk_realize (long /*int*/ widget) { +long gtk_realize (long widget) { if (!GTK.GTK4) { - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) { - long /*int*/ window = gtk_widget_get_window (paintHandle ()); + long window = gtk_widget_get_window (paintHandle ()); GTK.gtk_im_context_set_client_window (imHandle, window); } } @@ -4130,7 +4130,7 @@ long /*int*/ gtk_realize (long /*int*/ widget) { } @Override -long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) { +long gtk_scroll_event (long widget, long eventPtr) { double [] eventX = new double[1]; double [] eventY = new double[1]; GDK.gdk_event_get_coords(eventPtr, eventX, eventY); @@ -4144,7 +4144,7 @@ case GDK.GDK_SCROLL_RIGHT: return sendMouseEvent (SWT.MouseHorizontalWheel, 0, -3, 0, true, time, eventRX[0], eventRY[0], false, state[0]) ? 0 : 1; case GDK.GDK_SCROLL_SMOOTH: - long /*int*/ result = 0; + long result = 0; double[] delta_x = new double[1], delta_y = new double [1]; if (GDK.gdk_event_get_scroll_deltas (eventPtr, delta_x, delta_y)) { if (delta_x [0] != 0) { @@ -4172,13 +4172,13 @@ long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) { } @Override -long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) { +long gtk_show_help (long widget, long helpType) { if (!hasFocus ()) return 0; return sendHelpEvent (helpType) ? 1 : 0; } @Override -long /*int*/ gtk_style_updated (long /*int*/ widget) { +long gtk_style_updated (long widget) { if (backgroundImage != null) { setBackgroundSurface (backgroundImage); } @@ -4186,9 +4186,9 @@ long /*int*/ gtk_style_updated (long /*int*/ widget) { } @Override -long /*int*/ gtk_unrealize (long /*int*/ widget) { +long gtk_unrealize (long widget) { if (!GTK.GTK4) { - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) GTK.gtk_im_context_set_client_window (imHandle, 0); } return 0; @@ -4210,16 +4210,16 @@ long /*int*/ gtk_unrealize (long /*int*/ widget) { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC (GCData data) { +public long internal_new_GC (GCData data) { checkWidget (); - long /*int*/ gdkResource = GTK.GTK4 ? paintSurface () : paintWindow (); + long gdkResource = GTK.GTK4 ? paintSurface () : paintWindow (); if (gdkResource == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ gc = data.cairo; + long gc = data.cairo; if (gc != 0) { Cairo.cairo_reference (gc); } else { if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ surface; + long surface; if (GTK.GTK4) { surface = GDK.gdk_surface_create_similar_surface(gdkResource, Cairo.CAIRO_CONTENT_COLOR_ALPHA, data.width, data.height); } else { @@ -4252,7 +4252,7 @@ public long /*int*/ internal_new_GC (GCData data) { return gc; } -long /*int*/ imHandle () { +long imHandle () { return 0; } @@ -4272,7 +4272,7 @@ long /*int*/ imHandle () { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC (long /*int*/ hDC, GCData data) { +public void internal_dispose_GC (long hDC, GCData data) { checkWidget (); Cairo.cairo_destroy (hDC); } @@ -4413,7 +4413,7 @@ boolean mnemonicMatch (char key) { void register () { super.register (); if (fixedHandle != 0) display.addWidget (fixedHandle, this); - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) display.addWidget (imHandle, this); } @@ -4530,7 +4530,7 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole if (!GTK.gtk_widget_get_realized(handle)) return; GdkRectangle rect = new GdkRectangle (); if (GTK.GTK4) { - long /*int*/ surface = paintSurface (); + long surface = paintSurface (); if (redrawAll) { int [] w = new int [1], h = new int [1]; gdk_surface_get_size (surface, w, h); @@ -4544,7 +4544,7 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole } GDK.gdk_surface_invalidate_rect(surface, rect); } else { - long /*int*/ window = paintWindow (); + long window = paintWindow (); if (redrawAll) { int [] w = new int [1], h = new int [1]; gdk_window_get_size (window, w, h); @@ -4613,7 +4613,7 @@ void releaseWidget () { } redrawSurface = 0; } else { - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) { GTK.gtk_im_context_reset (imHandle); GTK.gtk_im_context_set_client_window (imHandle, 0); @@ -4646,7 +4646,7 @@ void releaseWidget () { * @param above a boolean setting for whether the window * should be raised or lowered */ -void restackWindow (long /*int*/ window, long /*int*/ sibling, boolean above) { +void restackWindow (long window, long sibling, boolean above) { GDK.gdk_window_restack (window, sibling, above); } @@ -4657,7 +4657,7 @@ void restackWindow (long /*int*/ window, long /*int*/ sibling, boolean above) { * @param above a boolean setting for whether the surface * should be raised or lowered */ -void restackSurface (long /*int*/ surface, long /*int*/ sibling, boolean above) { +void restackSurface (long surface, long sibling, boolean above) { GDK.gdk_surface_restack (surface, sibling, above); } @@ -4764,7 +4764,7 @@ boolean sendGestureEvent (int stateMask, int detail, int x, int y, double rotati return event.doit; } -boolean sendHelpEvent (long /*int*/ helpType) { +boolean sendHelpEvent (long helpType) { Control control = this; while (control != null) { if (control.hooks (SWT.Help)) { @@ -4833,12 +4833,12 @@ boolean sendMouseEvent (int type, int button, int count, int detail, boolean sen int [] origin_x = new int [1], origin_y = new int [1]; Rectangle eventRect; if (GTK.GTK4) { - long /*int*/ surface = eventSurface (); + long surface = eventSurface (); GDK.gdk_surface_get_origin (surface, origin_x, origin_y); eventRect = new Rectangle ((int)x - origin_x [0], (int)y - origin_y [0], 0, 0); event.setBounds (DPIUtil.autoScaleDown (eventRect)); } else { - long /*int*/ window = eventWindow (); + long window = eventWindow (); GDK.gdk_window_get_origin (window, origin_x, origin_y); eventRect = new Rectangle ((int)x - origin_x [0], (int)y - origin_y [0], 0, 0); event.setBounds (DPIUtil.autoScaleDown (eventRect)); @@ -4929,12 +4929,12 @@ private boolean sendOrPost(int type, Event event) { * @param hAlign is of type GTKAlign enum. See OS.java * @param vAlign is of type GTKAlign enum. See OS.java */ -void gtk_widget_set_align(long /*int*/ widget, int hAlign, int vAlign) { +void gtk_widget_set_align(long widget, int hAlign, int vAlign) { GTK.gtk_widget_set_halign (widget, hAlign); GTK.gtk_widget_set_valign (widget, vAlign); } -void gtk_label_set_align(long /*int*/ label, float xAlign, float yAlign) { +void gtk_label_set_align(long label, float xAlign, float yAlign) { GTK.gtk_label_set_xalign(label, xAlign); GTK.gtk_label_set_yalign(label, yAlign); } @@ -4998,7 +4998,7 @@ private void _setBackground (Color color) { redrawChildren (); } -void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGdkRGBA (long context, long handle, GdkRGBA rgba) { GdkRGBA selectedBackground = display.getSystemColor(SWT.COLOR_LIST_SELECTION).handle; if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { // Form background string @@ -5019,7 +5019,7 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg } } -void setBackgroundGradientGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGradientGdkRGBA (long context, long handle, GdkRGBA rgba) { String css ="* {\n"; if (rgba != null) { String color = display.gtk_rgba_to_css_string (rgba); @@ -5036,7 +5036,7 @@ void setBackgroundGradientGdkRGBA (long /*int*/ context, long /*int*/ handle, Gd gtk_css_provider_load_from_css (context, finalCss); } -void gtk_css_provider_load_from_css (long /*int*/ context, String css) { +void gtk_css_provider_load_from_css (long context, String css) { /* Utility function. */ //@param css : a 'css java' string like "{\nbackground: red;\n}". @@ -5056,7 +5056,7 @@ void setBackgroundGdkRGBA(GdkRGBA rgba) { setBackgroundGdkRGBA (handle, rgba); } -void setBackgroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGdkRGBA (long handle, GdkRGBA rgba) { double alpha = 1.0; if (rgba == null) { if ((state & PARENT_BACKGROUND) != 0) { @@ -5072,7 +5072,7 @@ void setBackgroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { if (rgba != null) { rgba.alpha = alpha / (float)255; } - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); setBackgroundGdkRGBA (context, handle, rgba); GTK.gtk_style_context_invalidate (context); return; @@ -5115,14 +5115,14 @@ public void setBackgroundImage (Image image) { } void setBackgroundSurface (Image image) { - long /*int*/ window = gtk_widget_get_window (paintHandle ()); + long window = gtk_widget_get_window (paintHandle ()); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { // gdk_window_set_background_pattern() deprecated in GTK3.22+ return; } if (window != 0) { if (image.surface != 0) { - long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(image.surface); + long pattern = Cairo.cairo_pattern_create_for_surface(image.surface); if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_pattern_set_extend(pattern, Cairo.CAIRO_EXTEND_REPEAT); GDK.gdk_window_set_background_pattern(window, pattern); @@ -5181,12 +5181,12 @@ public void setCursor (Cursor cursor) { setCursor (cursor != null ? cursor.handle : 0); } -void setCursor (long /*int*/ cursor) { +void setCursor (long cursor) { if (GTK.GTK4) { - long /*int*/ surface = eventSurface (); + long surface = eventSurface (); GDK.gdk_surface_set_cursor(surface, cursor); } else { - long /*int*/ window = eventWindow (); + long window = eventWindow (); if (window != 0) { GDK.gdk_window_set_cursor (window, cursor); } @@ -5216,7 +5216,7 @@ public void setDragDetect (boolean dragDetect) { } } -static long /*int*/ enterNotifyEventProc (long /*int*/ ihint, long /*int*/ n_param_values, long /*int*/ param_values, long /*int*/ data) { +static long enterNotifyEventProc (long ihint, long n_param_values, long param_values, long data) { /* 427776: this workaround listens to the enter-notify-event signal on all * GtkWidgets. If enableWindow (the data parameter) has been added to the * internal hash table of the widget, a record is kept as the lifetime of @@ -5224,13 +5224,13 @@ static long /*int*/ enterNotifyEventProc (long /*int*/ ihint, long /*int*/ n_par * when we destroy enableWindow. this internal hash table was removed in * GTK 3.11.9 so once only newer GTK is targeted, this workaround can be * removed. */ - long /*int*/ instance = OS.g_value_peek_pointer (param_values); - long /*int*/ hashTable = OS.g_object_get_qdata (instance, GTK_POINTER_WINDOW); + long instance = OS.g_value_peek_pointer (param_values); + long hashTable = OS.g_object_get_qdata (instance, GTK_POINTER_WINDOW); // there will only ever be one item in the hash table if (hashTable != 0) { - long /*int*/ firstItem = OS.g_hash_table_get_values (hashTable); - long /*int*/ gdkWindow = OS.g_list_data (firstItem); + long firstItem = OS.g_hash_table_get_values (hashTable); + long gdkWindow = OS.g_list_data (firstItem); // data is actually enableWindow if (gdkWindow == data) OS.g_object_set_qdata(gdkWindow, SWT_GRAB_WIDGET, instance); @@ -5277,9 +5277,9 @@ public void setEnabled (boolean enabled) { } } else { GTK.gtk_widget_realize (handle); - long /*int*/ parentHandle = parent.eventHandle (); - long /*int*/ surface = parent.eventSurface (); - long /*int*/ topHandle = topHandle (); + long parentHandle = parent.eventHandle (); + long surface = parent.eventSurface (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); GdkRectangle rect = new GdkRectangle (); @@ -5301,9 +5301,9 @@ public void setEnabled (boolean enabled) { } } else { GTK.gtk_widget_realize (handle); - long /*int*/ parentHandle = parent.eventHandle (); - long /*int*/ window = parent.eventWindow (); - long /*int*/ topHandle = topHandle (); + long parentHandle = parent.eventHandle (); + long window = parent.eventWindow (); + long topHandle = topHandle (); GdkWindowAttr attributes = new GdkWindowAttr (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); @@ -5344,7 +5344,7 @@ void cleanupEnableWindow() { * table was removed in GTK 3.11.9 so once only newer GTK is * targeted, this workaround can be removed. */ - long /*int*/ grabWidget = OS.g_object_get_qdata(enableWindow, SWT_GRAB_WIDGET); + long grabWidget = OS.g_object_get_qdata(enableWindow, SWT_GRAB_WIDGET); if (grabWidget != 0) { OS.g_object_set_qdata(grabWidget, GTK_POINTER_WINDOW, 0); OS.g_object_set_qdata(enableWindow, SWT_GRAB_WIDGET, 0); @@ -5401,7 +5401,7 @@ public void setFont (Font font) { checkWidget(); if (((state & FONT) == 0) && font == null) return; this.font = font; - long /*int*/ fontDesc; + long fontDesc; if (font == null) { fontDesc = defaultFont ().handle; } else { @@ -5416,7 +5416,7 @@ public void setFont (Font font) { setFontDescription (fontDesc); } -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { setFontDescription (handle, font); } @@ -5460,7 +5460,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) { setForegroundGdkRGBA (handle, rgba); } -void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setForegroundGdkRGBA (long handle, GdkRGBA rgba) { if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { GdkRGBA toSet; if (rgba != null) { @@ -5468,7 +5468,7 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { } else { toSet = display.COLOR_WIDGET_FOREGROUND_RGBA; } - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); // Form foreground string String color = display.gtk_rgba_to_css_string(toSet); String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle) @@ -5489,7 +5489,7 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { GdkRGBA selectedForeground = display.COLOR_LIST_SELECTION_TEXT_RGBA; GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_NORMAL, rgba); GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_SELECTED, selectedForeground); - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); GTK.gtk_style_context_invalidate (context); return; } @@ -5503,7 +5503,7 @@ void setInitialBounds () { * first sized. The fix is to set the value to (0, 0) as * expected by SWT. */ - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation(); if ((parent.style & SWT.MIRRORED) != 0) { allocation.x = parent.getClientWidth (); @@ -5585,7 +5585,7 @@ private void setZoomGesture () { } } -static Control getControl(long /*int*/ handle) { +static Control getControl(long handle) { Display display = Display.findDisplay(Thread.currentThread()); if (display ==null || display.isDisposed()) return null; Widget widget = display.findWidget(handle); @@ -5593,7 +5593,7 @@ static Control getControl(long /*int*/ handle) { return (Control) widget; } -static void rotateProc(long /*int*/ gesture, double angle, double angle_delta, long /*int*/ user_data) { +static void rotateProc(long gesture, double angle, double angle_delta, long user_data) { if (GTK.gtk_gesture_is_recognized(gesture)) { int [] state = new int[1]; double [] x = new double[1]; @@ -5612,7 +5612,7 @@ static void rotateProc(long /*int*/ gesture, double angle, double angle_delta, l } } -static void magnifyProc(long /*int*/ gesture, double zoom, long /*int*/ user_data) { +static void magnifyProc(long gesture, double zoom, long user_data) { if (GTK.gtk_gesture_is_recognized(gesture)) { int [] state = new int[1]; double [] x = new double[1]; @@ -5625,7 +5625,7 @@ static void magnifyProc(long /*int*/ gesture, double zoom, long /*int*/ user_dat } } -static void swipeProc(long /*int*/ gesture, double velocity_x, double velocity_y, long /*int*/ user_data) { +static void swipeProc(long gesture, double velocity_x, double velocity_y, long user_data) { if (GTK.gtk_gesture_is_recognized(gesture)) { double [] xVelocity = new double [1]; double [] yVelocity = new double [1]; @@ -5641,7 +5641,7 @@ static void swipeProc(long /*int*/ gesture, double velocity_x, double velocity_y } } -static void gestureBeginProc(long /*int*/ gesture, long /*int*/ sequence, long /*int*/ user_data) { +static void gestureBeginProc(long gesture, long sequence, long user_data) { if (GTK.gtk_gesture_is_recognized(gesture)) { int [] state = new int[1]; double [] x = new double[1]; @@ -5653,7 +5653,7 @@ static void gestureBeginProc(long /*int*/ gesture, long /*int*/ sequence, long / } } -static void gestureEndProc(long /*int*/ gesture, long /*int*/ sequence, long /*int*/ user_data) { +static void gestureEndProc(long gesture, long sequence, long user_data) { if (GTK.gtk_gesture_is_recognized(gesture)) { int [] state = new int[1]; double [] x = new double[1]; @@ -5759,7 +5759,7 @@ public boolean setParent (Composite parent) { if (this.parent == parent) return true; if (!isReparentable ()) return false; GTK.gtk_widget_realize (parent.handle); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); int x = allocation.x; @@ -5781,7 +5781,7 @@ public boolean setParent (Composite parent) { newDecorations.fixAccelGroup (); oldDecorations.fixAccelGroup (); } - long /*int*/ newParent = parent.parentingHandle(); + long newParent = parent.parentingHandle(); gtk_widget_reparent(this, newParent); OS.swt_fixed_move (newParent, topHandle, x, y); /* @@ -5857,7 +5857,7 @@ public void setRedraw (boolean redraw) { } } else { if (redrawWindow != 0) { - long /*int*/ window = paintWindow (); + long window = paintWindow (); /* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */ GDK.gdk_window_hide (redrawWindow); GDK.gdk_window_destroy (redrawWindow); @@ -5871,14 +5871,14 @@ public void setRedraw (boolean redraw) { if (GTK.gtk_widget_get_realized (handle)) { Rectangle rect = getBoundsInPixels (); if (GTK.GTK4) { - long /*int*/ surface = paintSurface(); + long surface = paintSurface(); GdkRectangle gdkRectangle = new GdkRectangle (); gdkRectangle.width = rect.width; gdkRectangle.height = rect.height; redrawSurface = GDK.gdk_surface_new_child(surface, gdkRectangle); GDK.gdk_surface_show(redrawSurface); } else { - long /*int*/ window = paintWindow (); + long window = paintWindow (); GdkWindowAttr attributes = new GdkWindowAttr (); attributes.width = rect.width; attributes.height = rect.height; @@ -6030,7 +6030,7 @@ public void setTouchEnabled(boolean enabled) { public void setVisible (boolean visible) { checkWidget(); if (((state & HIDDEN) == 0) == visible) return; - long /*int*/ topHandle = topHandle(); + long topHandle = topHandle(); if (visible) { /* * It is possible (but unlikely), that application @@ -6119,12 +6119,12 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi } } - long /*int*/ topHandle = topHandle (); - long /*int*/ siblingHandle = sibling != null ? sibling.topHandle () : 0; + long topHandle = topHandle (); + long siblingHandle = sibling != null ? sibling.topHandle () : 0; if (GTK.GTK4) { - long /*int*/ surface = gtk_widget_get_surface (topHandle); + long surface = gtk_widget_get_surface (topHandle); if (surface != 0) { - long /*int*/ siblingSurface = 0; + long siblingSurface = 0; if (sibling != null) { if (above && sibling.enableSurface != 0) { siblingSurface = enableSurface; @@ -6132,7 +6132,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi siblingSurface = GTK.gtk_widget_get_surface (siblingHandle); } } - long /*int*/ redrawSurface = fixChildren ? parent.redrawSurface : 0; + long redrawSurface = fixChildren ? parent.redrawSurface : 0; if (!OS.isX11 () || (siblingSurface == 0 && (!above || redrawSurface == 0))) { if (above) { GDK.gdk_surface_raise (surface); @@ -6143,7 +6143,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi GDK.gdk_surface_lower (surface); } } else { - long /*int*/ siblingS = siblingSurface != 0 ? siblingSurface : redrawSurface; + long siblingS = siblingSurface != 0 ? siblingSurface : redrawSurface; boolean stack_mode = above; if (redrawSurface != 0 && siblingSurface == 0) stack_mode = false; restackSurface (surface, siblingS, stack_mode); @@ -6153,9 +6153,9 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi } } } else { - long /*int*/ window = gtk_widget_get_window (topHandle); + long window = gtk_widget_get_window (topHandle); if (window != 0) { - long /*int*/ siblingWindow = 0; + long siblingWindow = 0; if (sibling != null) { if (above && sibling.enableWindow != 0) { siblingWindow = enableWindow; @@ -6163,7 +6163,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi siblingWindow = GTK.gtk_widget_get_window (siblingHandle); } } - long /*int*/ redrawWindow = fixChildren ? parent.redrawWindow : 0; + long redrawWindow = fixChildren ? parent.redrawWindow : 0; if (!OS.isX11 () || (siblingWindow == 0 && (!above || redrawWindow == 0))) { if (above) { GDK.gdk_window_raise (window); @@ -6174,7 +6174,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi GDK.gdk_window_lower (window); } } else { - long /*int*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow; + long siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow; boolean stack_mode = above; if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false; restackWindow (window, siblingW, stack_mode); @@ -6264,8 +6264,8 @@ boolean showMenu (int x, int y, int detail) { void showWidget () { // Comment this line to disable zero-sized widgets state |= ZERO_WIDTH | ZERO_HEIGHT; - long /*int*/ topHandle = topHandle (); - long /*int*/ parentHandle = parent.parentingHandle (); + long topHandle = topHandle (); + long parentHandle = parent.parentingHandle (); parent.setParentGdkResource (this); GTK.gtk_container_add (parentHandle, topHandle); if (handle != 0 && handle != topHandle) GTK.gtk_widget_show (handle); @@ -6496,7 +6496,7 @@ boolean translateMnemonic (Event event, Control control) { return traverse (event); } -boolean translateMnemonic (int keyval, long /*int*/ event) { +boolean translateMnemonic (int keyval, long event) { long key = GDK.gdk_keyval_to_unicode (keyval); int [] state = new int[1]; GDK.gdk_event_get_state(event, state); @@ -6520,7 +6520,7 @@ boolean translateMnemonic (int keyval, long /*int*/ event) { return false; } -boolean translateTraversal (long /*int*/ event) { +boolean translateTraversal (long event) { int detail = SWT.TRAVERSE_NONE; int [] eventKeyval = new int [1]; GDK.gdk_event_get_keyval(event, eventKeyval); @@ -6584,7 +6584,7 @@ boolean translateTraversal (long /*int*/ event) { return false; } -int traversalCode (int key, long /*int*/ event) { +int traversalCode (int key, long event) { int code = SWT.TRAVERSE_RETURN | SWT.TRAVERSE_TAB_NEXT | SWT.TRAVERSE_TAB_PREVIOUS | SWT.TRAVERSE_PAGE_NEXT | SWT.TRAVERSE_PAGE_PREVIOUS; Shell shell = getShell (); if (shell.parent != null) code |= SWT.TRAVERSE_ESCAPE; @@ -6713,7 +6713,7 @@ void update (boolean all, boolean flush) { // checkWidget(); if (!GTK.gtk_widget_get_visible (topHandle ())) return; if (!GTK.gtk_widget_get_realized (handle)) return; - long /*int*/ window = paintWindow (); + long window = paintWindow (); if (flush) display.flushExposes (window, all); /* * Do not send expose events on GTK 3.16.0+ @@ -6737,7 +6737,7 @@ void updateLayout (boolean all) { } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long user_data) { switch ((int)/*64*/user_data) { case EXPOSE_EVENT_INVERSE: { if ((state & OBSCURED) != 0) break; @@ -6746,7 +6746,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us if (!draw && (state & CANVAS) != 0) { if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) { GdkRGBA rgba = new GdkRGBA(); - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba); draw = rgba.alpha == 0; } else { @@ -6754,11 +6754,11 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us } } if (draw) { - long /*int*/ cairo = arg0; + long cairo = arg0; GdkRectangle rect = new GdkRectangle (); GDK.gdk_cairo_get_clip_rectangle (cairo, rect); if (control == null) control = this; - long /*int*/ window = GTK.gtk_widget_get_window (handle); + long window = GTK.gtk_widget_get_window (handle); if (window != 0) { drawBackground (control, window, 0, 0, rect.x, rect.y, rect.width, rect.height); } else { @@ -6783,7 +6783,7 @@ Point getWindowOrigin () { int [] x = new int [1]; int [] y = new int [1]; - long /*int*/ window = eventWindow (); + long window = eventWindow (); GDK.gdk_window_get_origin (window, x, y); return new Point (x [0], y [0]); @@ -6799,7 +6799,7 @@ Point getSurfaceOrigin () { int [] x = new int [1]; int [] y = new int [1]; - long /*int*/ surface = eventSurface (); + long surface = eventSurface (); GDK.gdk_surface_get_origin (surface, x, y); return new Point (x [0], y [0]); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java index 9f5659021f..b859dbee69 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java @@ -68,7 +68,7 @@ public class DateTime extends Composite { * Major handles of this class. * Note, these can vary or all equal each other depending on Date/Time/Calendar/Drop_down * configuration used. See createHandle () */ - long /*int*/ textEntryHandle, spinButtonHandle, + long textEntryHandle, spinButtonHandle, containerHandle, calendarHandle; @@ -361,7 +361,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) { Rectangle trim = super.computeTrimInPixels (x, y, width, height); int xborder = 0, yborder = 0; GtkBorder tmp = new GtkBorder (); - long /*int*/ context = GTK.gtk_widget_get_style_context (GTK.GTK4 ? spinButtonHandle :textEntryHandle); + long context = GTK.gtk_widget_get_style_context (GTK.GTK4 ? spinButtonHandle :textEntryHandle); int state_flag = GTK.GTK_VERSION < OS.VERSION(3, 18, 0) ? GTK.GTK_STATE_FLAG_NORMAL : GTK.gtk_widget_get_state_flags(textEntryHandle); gtk_style_context_get_padding(context, state_flag, tmp); trim.x -= tmp.left; @@ -463,11 +463,11 @@ private void createHandleForDateWithDropDown () { } private void createHandleForDateTime () { - long /*int*/ adjusment = GTK.gtk_adjustment_new (0, -9999, 9999, 1, 0, 0); + long adjusment = GTK.gtk_adjustment_new (0, -9999, 9999, 1, 0, 0); if (GTK.GTK4) { spinButtonHandle = GTK.gtk_spin_button_new (adjusment, 1, 0); - long /*int*/ boxHandle = GTK.gtk_widget_get_first_child(spinButtonHandle); - long /*int*/ textHandle = GTK.gtk_widget_get_first_child(boxHandle); + long boxHandle = GTK.gtk_widget_get_first_child(spinButtonHandle); + long textHandle = GTK.gtk_widget_get_first_child(boxHandle); textEntryHandle = textHandle; handle = spinButtonHandle; containerHandle = spinButtonHandle; @@ -551,7 +551,7 @@ void createPopupShell (int year, int month, int day) { } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { if (isDateWithDropDownButton ()) { prefferedSize = null; //flush cache for computeSize as font can cause size to change. setFontDescription (textEntryHandle, font); @@ -885,39 +885,39 @@ public int getYear () { } @Override -long /*int*/ gtk_day_selected (long /*int*/ widget) { +long gtk_day_selected (long widget) { sendSelectionEvent (); return 0; } @Override -long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) { +long gtk_day_selected_double_click (long widget) { sendSelectionEvent (SWT.DefaultSelection); return 0; } @Override -long /*int*/ gtk_month_changed (long /*int*/ widget) { +long gtk_month_changed (long widget) { sendSelectionEvent (); return 0; } @Override -long /*int*/ eventHandle () { +long eventHandle () { return dateTimeHandle (); } @Override -long /*int*/ focusHandle () { +long focusHandle () { return dateTimeHandle (); } @Override -long /*int*/ fontHandle () { +long fontHandle () { return dateTimeHandle (); } -private long /*int*/ dateTimeHandle () { +private long dateTimeHandle () { if (isCalendar () && calendarHandle != 0) { return calendarHandle; } else if ((isDate () || isTime ())) { @@ -961,11 +961,11 @@ final private void hookEventsForCalendar () { final private void hookEventsForDateTimeSpinner () { OS.g_signal_connect_closure (textEntryHandle, OS.output, display.getClosure (OUTPUT), true); if (GTK.GTK4) { - long /*int*/ keyController = GTK.gtk_event_controller_key_new(); + long keyController = GTK.gtk_event_controller_key_new(); GTK.gtk_widget_add_controller(textEntryHandle, keyController); GTK.gtk_event_controller_set_propagation_phase(keyController, GTK.GTK_PHASE_TARGET); - long /*int*/ focusAddress = display.focusCallback.getAddress(); + long focusAddress = display.focusCallback.getAddress(); OS.g_signal_connect (keyController, OS.focus_in, focusAddress, FOCUS_IN); } else { OS.g_signal_connect_closure (textEntryHandle, OS.focus_in_event, display.getClosure (FOCUS_IN_EVENT), true); @@ -1390,7 +1390,7 @@ void setBackgroundGdkRGBA (GdkRGBA rgba) { } @Override -void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGdkRGBA (long context, long handle, GdkRGBA rgba) { // We need to override here because DateTime widgets use "background" instead of // "background-color" as their CSS property. if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { @@ -1689,7 +1689,7 @@ void setBoundsInPixels (int x, int y, int width, int height) { //Date with Drop down is in container. Needs extra handling. if (isDateWithDropDownButton ()) { - long /*int*/ sizingHandle = GTK.GTK4 ? spinButtonHandle : textEntryHandle; + long sizingHandle = GTK.GTK4 ? spinButtonHandle : textEntryHandle; GtkRequisition requisition = new GtkRequisition (); GTK.gtk_widget_get_preferred_size (sizingHandle, null, requisition); int oldHeight = requisition.height; //Entry should not expand vertically. It is single liner. @@ -1751,8 +1751,8 @@ private void setDropDownButtonSize () { GtkBorder getGtkBorderPadding () { //In Gtk3, acquire border. GtkBorder gtkBorderPadding = new GtkBorder (); - long /*int*/ contextHandle = GTK.GTK4 ? spinButtonHandle : textEntryHandle; - long /*int*/ context = GTK.gtk_widget_get_style_context (contextHandle); + long contextHandle = GTK.GTK4 ? spinButtonHandle : textEntryHandle; + long context = GTK.gtk_widget_get_style_context (contextHandle); int state_flag = GTK.GTK_VERSION < OS.VERSION(3, 18, 0) ? GTK.GTK_STATE_FLAG_NORMAL : GTK.gtk_widget_get_state_flags(contextHandle); gtk_style_context_get_padding(context, state_flag, gtkBorderPadding); return gtkBorderPadding; @@ -1864,7 +1864,7 @@ void deregister () { if (textEntryHandle != 0 && textEntryHandle != containerHandle) display.removeWidget (textEntryHandle); } -int getArrow(long /*int*/ widget) { +int getArrow(long widget) { updateControl(); int adj_value = (int) GTK.gtk_adjustment_get_value(GTK.gtk_spin_button_get_adjustment(widget)); int new_value = 0; @@ -1941,7 +1941,7 @@ void setText (String dateTimeText) { } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_press_event (long widget, long event) { if (!isReadOnly () && (isTime () || isDate ())) { int [] key = new int[1]; GDK.gdk_event_get_keyval(event, key); @@ -2005,7 +2005,7 @@ Point getSelection () { int [] start = new int [1]; int [] end = new int [1]; GTK.gtk_editable_get_selection_bounds (textEntryHandle, start, end); - long /*int*/ ptr = GTK.gtk_entry_get_text (textEntryHandle); + long ptr = GTK.gtk_entry_get_text (textEntryHandle); start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); selection = new Point (start [0], end [0]); @@ -2028,7 +2028,7 @@ Point getSelection () { String getText () { checkWidget (); if (textEntryHandle != 0) { - long /*int*/ str = GTK.gtk_entry_get_text (textEntryHandle); + long str = GTK.gtk_entry_get_text (textEntryHandle); if (str == 0) return ""; int length = C.strlen (str); byte [] buffer = new byte [length]; @@ -2059,7 +2059,7 @@ String getText (String str,int start, int end) { void setSelection (int start, int end) { checkWidget (); - long /*int*/ ptr = GTK.gtk_entry_get_text (textEntryHandle); + long ptr = GTK.gtk_entry_get_text (textEntryHandle); start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); GTK.gtk_editable_set_position (textEntryHandle, start); @@ -2095,7 +2095,7 @@ private int validateValueBounds(FieldPosition field, int value) { } @Override -long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_release_event (long widget, long event) { if (isDate () || isTime ()) { int [] eventButton = new int [1]; GDK.gdk_event_get_button(event, eventButton); @@ -2112,7 +2112,7 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) * This method compares two values and determines if Up or down arrow was called. */ @Override -long /*int*/ gtk_output (long /*int*/ widget) { +long gtk_output (long widget) { if (calendar == null) { return 0; //Guard: Object not fully initialized yet. } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java index e2b79c81ee..619035829b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java @@ -106,7 +106,7 @@ public class Decorations extends Canvas { Menu [] menus; Control savedFocus; Button defaultButton, saveDefault; - long /*int*/ accelGroup, vboxHandle; + long accelGroup, vboxHandle; Decorations () { /* Do nothing */ @@ -179,17 +179,17 @@ void _setImages (Image [] images) { sort (bestImages); images = bestImages; } - long /*int*/ pixbufs = 0; + long pixbufs = 0; if (images != null) { for (int i = 0; i < images.length; i++) { Image image = images [i]; - long /*int*/ pixbuf = ImageList.createPixbuf (image); + long pixbuf = ImageList.createPixbuf (image); pixbufs = OS.g_list_append (pixbufs, pixbuf); } } GTK.gtk_window_set_icon_list (topHandle (), pixbufs); - long /*int*/ [] data = new long /*int*/ [1]; - long /*int*/ temp = pixbufs; + long [] data = new long [1]; + long temp = pixbufs; while (temp != 0) { C.memmove (data, temp, C.PTR_SIZEOF); OS.g_object_unref (data [0]); @@ -242,7 +242,7 @@ void createAccelGroup () { accelGroup = GTK.gtk_accel_group_new (); if (accelGroup == 0) error (SWT.ERROR_NO_HANDLES); //FIXME - what should we do for Decorations - long /*int*/ shellHandle = topHandle (); + long shellHandle = topHandle (); GTK.gtk_window_add_accel_group (shellHandle, accelGroup); } @@ -254,7 +254,7 @@ void createWidget (int index) { void destroyAccelGroup () { if (accelGroup == 0) return; - long /*int*/ shellHandle = topHandle (); + long shellHandle = topHandle (); GTK.gtk_window_remove_accel_group (shellHandle, accelGroup); //TEMPORARY CODE // OS.g_object_unref (accelGroup); @@ -556,11 +556,11 @@ boolean restoreFocus () { */ public void setDefaultButton (Button button) { checkWidget(); - long /*int*/ buttonHandle = 0; + long buttonHandle = 0; if (saveDefault != null && !saveDefault.isDisposed () ) { - long /*int*/ saveButtonHandle = saveDefault.handle; + long saveButtonHandle = saveDefault.handle; if (saveButtonHandle != 0) { - long /*int*/ context = GTK.gtk_widget_get_style_context (saveButtonHandle); + long context = GTK.gtk_widget_get_style_context (saveButtonHandle); GTK.gtk_style_context_remove_class(context, GTK.GTK_STYLE_CLASS_SUGGESTED_ACTION); } } @@ -571,7 +571,7 @@ public void setDefaultButton (Button button) { } saveDefault = defaultButton = button; if (buttonHandle != 0) { - long /*int*/ context = GTK.gtk_widget_get_style_context (buttonHandle); + long context = GTK.gtk_widget_get_style_context (buttonHandle); GTK.gtk_style_context_add_class(context, GTK.GTK_STYLE_CLASS_SUGGESTED_ACTION); } GTK.gtk_window_set_default (topHandle (), buttonHandle); @@ -796,7 +796,7 @@ boolean traverseReturn () { * key. */ if (!button.isVisible () || !button.isEnabled ()) return true; - long /*int*/ shellHandle = _getShell ().topHandle (); + long shellHandle = _getShell ().topHandle (); return GTK.gtk_window_activate_default (shellHandle); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java index 28fd789454..ec46198aec 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java @@ -136,9 +136,9 @@ public String open () { */ String openNativeChooserDialog () { byte [] titleBytes = Converter.wcsToMbcs (title, true); - long /*int*/ shellHandle = parent.topHandle (); + long shellHandle = parent.topHandle (); Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); - long /*int*/ handle = 0; + long handle = 0; handle = GTK.gtk_file_chooser_native_new(titleBytes, shellHandle, GTK.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_NAMED_LABEL_CANCEL); if (handle == 0) error (SWT.ERROR_NO_HANDLES); @@ -155,7 +155,7 @@ String openNativeChooserDialog () { * to be true canonical path. So using realpath to convert the path to * true canonical path. */ - long /*int*/ ptr = OS.realpath (buffer, null); + long ptr = OS.realpath (buffer, null); if (ptr != 0) { GTK.gtk_file_chooser_set_current_folder (handle, ptr); OS.g_free (ptr); @@ -163,10 +163,10 @@ String openNativeChooserDialog () { } if (message.length () > 0) { byte [] buffer = Converter.wcsToMbcs (message, true); - long /*int*/ box = GTK.gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, 0); + long box = GTK.gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, 0); GTK.gtk_box_set_homogeneous (box, false); if (box == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ label = GTK.gtk_label_new (buffer); + long label = GTK.gtk_label_new (buffer); if (label == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_container_add (box, label); GTK.gtk_widget_show (label); @@ -177,7 +177,7 @@ String openNativeChooserDialog () { String answer = null; display.addIdleProc (); int signalId = 0; - long /*int*/ hookId = 0; + long hookId = 0; if ((style & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); @@ -196,14 +196,14 @@ String openNativeChooserDialog () { OS.g_signal_remove_emission_hook (signalId, hookId); } if (response == GTK.GTK_RESPONSE_ACCEPT) { - long /*int*/ path = GTK.gtk_file_chooser_get_filename (handle); + long path = GTK.gtk_file_chooser_get_filename (handle); if (path != 0) { - long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); + long utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path); if (path != utf8Ptr) OS.g_free (path); if (utf8Ptr != 0) { - long /*int*/ [] items_written = new long /*int*/ [1]; - long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + long [] items_written = new long [1]; + long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { int clength = (int)/*64*/items_written [0]; @@ -221,19 +221,19 @@ String openNativeChooserDialog () { } String openChooserDialog () { byte [] titleBytes = Converter.wcsToMbcs (title, true); - long /*int*/ shellHandle = parent.topHandle (); + long shellHandle = parent.topHandle (); Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); - long /*int*/ handle = 0; + long handle = 0; if (display.getDismissalAlignment() == SWT.RIGHT) { handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, GTK.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK.GTK_NAMED_LABEL_CANCEL, GTK.GTK_RESPONSE_CANCEL, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_RESPONSE_OK, 0); } else { handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, GTK.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_RESPONSE_OK, GTK.GTK_NAMED_LABEL_CANCEL, GTK.GTK_RESPONSE_CANCEL, 0); } if (handle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ group = GTK.gtk_window_get_group(0); + long group = GTK.gtk_window_get_group(0); GTK.gtk_window_group_add_window (group, handle); GTK.gtk_window_set_modal (handle, true); - long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle); + long pixbufs = GTK.gtk_window_get_icon_list (shellHandle); if (pixbufs != 0) { GTK.gtk_window_set_icon_list (handle, pixbufs); OS.g_list_free (pixbufs); @@ -251,7 +251,7 @@ String openChooserDialog () { * to be true canonical path. So using realpath to convert the path to * true canonical path. */ - long /*int*/ ptr = OS.realpath (buffer, null); + long ptr = OS.realpath (buffer, null); if (ptr != 0) { GTK.gtk_file_chooser_set_current_folder (handle, ptr); OS.g_free (ptr); @@ -259,10 +259,10 @@ String openChooserDialog () { } if (message.length () > 0) { byte [] buffer = Converter.wcsToMbcs (message, true); - long /*int*/ box = GTK.gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, 0); + long box = GTK.gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, 0); GTK.gtk_box_set_homogeneous (box, false); if (box == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ label = GTK.gtk_label_new (buffer); + long label = GTK.gtk_label_new (buffer); if (label == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_container_add (box, label); GTK.gtk_widget_show (label); @@ -278,7 +278,7 @@ String openChooserDialog () { display.setModalDialog (this); } int signalId = 0; - long /*int*/ hookId = 0; + long hookId = 0; if ((style & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); @@ -300,14 +300,14 @@ String openChooserDialog () { display.setModalDialog (oldModal); } if (response == GTK.GTK_RESPONSE_OK) { - long /*int*/ path = GTK.gtk_file_chooser_get_filename (handle); + long path = GTK.gtk_file_chooser_get_filename (handle); if (path != 0) { - long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); + long utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path); if (path != utf8Ptr) OS.g_free (path); if (utf8Ptr != 0) { - long /*int*/ [] items_written = new long /*int*/ [1]; - long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + long [] items_written = new long [1]; + long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { int clength = (int)/*64*/items_written [0]; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index d803d1c60d..1d2ef21557 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -118,19 +118,19 @@ public class Display extends Device { /* Events Dispatching and Callback */ int gdkEventCount; - long /*int*/ [] gdkEvents; + long [] gdkEvents; Widget [] gdkEventWidgets; int [] dispatchEvents; Event [] eventQueue; - long /*int*/ fds; + long fds; int allocated_nfds; boolean wake; int [] max_priority = new int [1], timeout = new int [1]; Callback eventCallback; - long /*int*/ eventProc, windowProc2, windowProc3, windowProc4, windowProc5, windowProc6; - long /*int*/ snapshotDrawProc; - long /*int*/ keyPressReleaseProc, focusProc, enterMotionScrollProc, leaveProc; - long /*int*/ gesturePressReleaseProc; + long eventProc, windowProc2, windowProc3, windowProc4, windowProc5, windowProc6; + long snapshotDrawProc; + long keyPressReleaseProc, focusProc, enterMotionScrollProc, leaveProc; + long gesturePressReleaseProc; Callback windowCallback2, windowCallback3, windowCallback4, windowCallback5, windowCallback6; Callback snapshotDraw; Callback keyPressReleaseCallback, focusCallback, enterMotionScrollCallback, leaveCallback; @@ -142,15 +142,15 @@ public class Display extends Device { static String APP_VERSION = ""; //$NON-NLS-1$ static final String DISPATCH_EVENT_KEY = "org.eclipse.swt.internal.gtk.dispatchEvent"; //$NON-NLS-1$ static final String ADD_WIDGET_KEY = "org.eclipse.swt.internal.addWidget"; //$NON-NLS-1$ - long /*int*/ [] closures, closuresProc; + long [] closures, closuresProc; int [] closuresCount; int [] signalIds; - long /*int*/ shellMapProcClosure; + long shellMapProcClosure; /* Widget Table */ int [] indexTable; int freeSlot; - long /*int*/ lastHandle; + long lastHandle; Widget lastWidget; Widget [] widgetTable; final static int GROW_SIZE = 1024; @@ -183,7 +183,7 @@ public class Display extends Device { /* Input method resources */ Control imControl; - long /*int*/ preeditWindow, preeditLabel; + long preeditWindow, preeditLabel; /* Sync/Async Widget Communication */ Synchronizer synchronizer = new Synchronizer (this); @@ -206,36 +206,36 @@ public class Display extends Device { int [] timerIds; Runnable [] timerList; Callback timerCallback; - long /*int*/ timerProc; + long timerProc; Callback windowTimerCallback; - long /*int*/ windowTimerProc; + long windowTimerProc; /* Caret */ Caret currentCaret; Callback caretCallback; int caretId; - long /*int*/ caretProc; + long caretProc; /* Mnemonics */ Control mnemonicControl; /* Mouse hover */ int mouseHoverId; - long /*int*/ mouseHoverHandle, mouseHoverProc; + long mouseHoverHandle, mouseHoverProc; Callback mouseHoverCallback; /* Tooltip size allocate callback */ - long /*int*/ sizeAllocateProc; + long sizeAllocateProc; Callback sizeAllocateCallback; - long /*int*/ sizeRequestProc; + long sizeRequestProc; Callback sizeRequestCallback; /* Shell map callback */ - long /*int*/ shellMapProc; + long shellMapProc; Callback shellMapCallback; /* Idle proc callback */ - long /*int*/ idleProc; + long idleProc; int idleHandle; Callback idleCallback; static final String ADD_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.addIdleProc"; //$NON-NLS-1$ @@ -244,28 +244,28 @@ public class Display extends Device { boolean idleNeeded; /* GtkTreeView callbacks */ - long /*int*/ cellDataProc; + long cellDataProc; Callback cellDataCallback; /* Set direction callback */ - long /*int*/ setDirectionProc; + long setDirectionProc; Callback setDirectionCallback; static final String GET_DIRECTION_PROC_KEY = "org.eclipse.swt.internal.gtk.getDirectionProc"; //$NON-NLS-1$ /* Set emissionProc callback */ - long /*int*/ emissionProc; + long emissionProc; Callback emissionProcCallback; static final String GET_EMISSION_PROC_KEY = "org.eclipse.swt.internal.gtk.getEmissionProc"; //$NON-NLS-1$ /* Get all children callback */ - long /*int*/ allChildrenProc, allChildren; + long allChildrenProc, allChildren; Callback allChildrenCallback; /* Settings callbacks */ - long /*int*/ signalProc; + long signalProc; Callback signalCallback; - long /*int*/ shellHandle; + long shellHandle; boolean settingsChanged, runSettings; static final int STYLE_UPDATED = 1; static final int PROPERTY_NOTIFY = 2; @@ -277,13 +277,13 @@ public class Display extends Device { Control currentControl; /* Flush exposes */ - long /*int*/ checkIfEventProc; + long checkIfEventProc; Callback checkIfEventCallback; - long /*int*/ flushWindow; + long flushWindow; boolean flushAll; GdkRectangle flushRect = new GdkRectangle (); XExposeEvent exposeEvent = new XExposeEvent (); - long /*int*/ [] flushData = new long /*int*/ [1]; + long [] flushData = new long [1]; /* System Resources */ Image errorImage, infoImage, questionImage, warningImage; @@ -320,15 +320,15 @@ public class Display extends Device { int lastEventTime, lastUserEventTime; /* Pango layout constructor */ - long /*int*/ pangoLayoutNewProc; - long /*int*/ pangoFontFamilyNewProc; - long /*int*/ pangoFontFaceNewProc; + long pangoLayoutNewProc; + long pangoFontFamilyNewProc; + long pangoFontFaceNewProc; /* IM Context constructor */ - long /*int*/ imContextNewProc; + long imContextNewProc; /* GtkPrinterOptionWidget constructor */ - long /*int*/ printerOptionWidgetNewProc; + long printerOptionWidgetNewProc; /* Custom Resize */ double resizeLocationX, resizeLocationY; @@ -336,15 +336,15 @@ public class Display extends Device { int resizeMode; /* Fixed Subclass */ - static long /*int*/ fixed_type; + static long fixed_type; /* Renderer Subclass */ - static long /*int*/ text_renderer_type, pixbuf_renderer_type, toggle_renderer_type; - static long /*int*/ text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr; + static long text_renderer_type, pixbuf_renderer_type, toggle_renderer_type; + static long text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr; static Callback rendererClassInitCallback, rendererRenderCallback, rendererSnapshotCallback; static Callback rendererGetPreferredWidthCallback; - static long /*int*/ rendererClassInitProc, rendererRenderProc, rendererSnapshotProc; - static long /*int*/ rendererGetPreferredWidthProc; + static long rendererClassInitProc, rendererRenderProc, rendererSnapshotProc; + static long rendererGetPreferredWidthProc; /* Key Mappings */ static final int [] [] KeyTable = { @@ -454,7 +454,7 @@ public class Display extends Device { Map groupKeysCount; /* Keymap "keys-changed" callback */ - long /*int*/ keysChangedProc; + long keysChangedProc; Callback keysChangedCallback; /* Multiple Displays. */ @@ -641,16 +641,16 @@ void addLayoutDeferred (Composite comp) { layoutDeferred[layoutDeferredCount++] = comp; } -void addGdkEvent (long /*int*/ event) { +void addGdkEvent (long event) { if (gdkEvents == null) { int length = GROW_SIZE; - gdkEvents = new long /*int*/ [length]; + gdkEvents = new long [length]; gdkEventWidgets = new Widget [length]; gdkEventCount = 0; } if (gdkEventCount == gdkEvents.length) { int length = gdkEventCount + GROW_SIZE; - long /*int*/ [] newEvents = new long /*int*/ [length]; + long [] newEvents = new long [length]; System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount); gdkEvents = newEvents; Widget [] newWidgets = new Widget [length]; @@ -658,7 +658,7 @@ void addGdkEvent (long /*int*/ event) { gdkEventWidgets = newWidgets; } Widget widget = null; - long /*int*/ handle = GTK.gtk_get_event_widget (event); + long handle = GTK.gtk_get_event_widget (event); if (handle != 0) { do { widget = getWidget (handle); @@ -755,7 +755,7 @@ private void gdbus_init_methods() { GDBus.init(methods); } -long /*int*/ allChildrenProc (long /*int*/ widget, long /*int*/ recurse) { +long allChildrenProc (long widget, long recurse) { allChildren = OS.g_list_append (allChildren, widget); if (recurse != 0 && GTK.GTK_IS_CONTAINER (widget)) { GTK.gtk_container_forall (widget, allChildrenProc, recurse); @@ -763,7 +763,7 @@ long /*int*/ allChildrenProc (long /*int*/ widget, long /*int*/ recurse) { return 0; } -void addMouseHoverTimeout (long /*int*/ handle) { +void addMouseHoverTimeout (long handle) { if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId); mouseHoverId = OS.g_timeout_add (400, mouseHoverProc, handle); mouseHoverHandle = handle; @@ -803,7 +803,7 @@ void addSkinnableWidget (Widget widget) { skinList [skinCount++] = widget; } -void addWidget (long /*int*/ handle, Widget widget) { +void addWidget (long handle, Widget widget) { if (handle == 0) return; // Last element in the indexTable is -1, so if freeSlot == -1 we have no place anymore if (freeSlot == LAST_TABLE_INDEX) { @@ -822,7 +822,7 @@ void addWidget (long /*int*/ handle, Widget widget) { } int index = freeSlot + 1; if(strictChecks) { - long /*int*/ data = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX); + long data = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX); if(data > 0 && data != index) { SWT.error(SWT.ERROR_INVALID_ARGUMENT, null, ". Potential leak of " + widget + debugInfoForIndex(data - 1)); } @@ -887,7 +887,7 @@ public void beep () { GDK.gdk_display_beep(GDK.gdk_display_get_default()); } -long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) { +long cellDataProc (long tree_column, long cell, long tree_model, long iter, long data) { Widget widget = getWidget (data); if (widget == null) return 0; return widget.cellDataProc (tree_column, cell, tree_model, iter, data); @@ -912,7 +912,7 @@ static void checkDisplay (Thread thread, boolean multiple) { } } -long /*int*/ checkIfEventProc (long /*int*/ display, long /*int*/ xEvent, long /*int*/ userData) { +long checkIfEventProc (long display, long xEvent, long userData) { int type = OS.X_EVENT_TYPE (xEvent); switch (type) { case OS.Expose: @@ -921,11 +921,11 @@ long /*int*/ checkIfEventProc (long /*int*/ display, long /*int*/ xEvent, long / default: return 0; } - long /*int*/ window = GDK.gdk_x11_window_lookup_for_display(GDK.gdk_display_get_default(), OS.X_EVENT_WINDOW (xEvent)); + long window = GDK.gdk_x11_window_lookup_for_display(GDK.gdk_display_get_default(), OS.X_EVENT_WINDOW (xEvent)); if (window == 0) return 0; if (flushWindow != 0) { if (flushAll) { - long /*int*/ tempWindow = window; + long tempWindow = window; do { if (tempWindow == flushWindow) break; } while ((tempWindow = GDK.gdk_window_get_parent (tempWindow)) != 0); @@ -1038,7 +1038,7 @@ void checkXimModule () { } void createDisplay (DeviceData data) { - boolean init = GTK.GTK4 ? GTK.gtk_init_check () : GTK.gtk_init_check (new long /*int*/ [] {0}, null); + boolean init = GTK.GTK4 ? GTK.gtk_init_check () : GTK.gtk_init_check (new long [] {0}, null); if (!init) SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); //$NON-NLS-1$ checkXimModule(); //set GTK+ Theme name as property for introspection purposes @@ -1052,7 +1052,7 @@ void createDisplay (DeviceData data) { xDisplay = GTK.GTK4 ? 0 : GDK.gdk_x11_get_default_xdisplay(); } if (OS.SWT_DEBUG) Device.DEBUG = true; - long /*int*/ ptr = GTK.gtk_check_version (GTK3_MAJOR, GTK3_MINOR, GTK3_MICRO); + long ptr = GTK.gtk_check_version (GTK3_MAJOR, GTK3_MINOR, GTK3_MICRO); if (ptr != 0) { int length = C.strlen (ptr); byte [] buffer = new byte [length]; @@ -1141,7 +1141,7 @@ void createDisplay (DeviceData data) { if (!GTK.GTK4) { byte[] atomName = Converter.wcsToMbcs ("SWT_Window_" + APP_NAME, true); //$NON-NLS-1$ - long /*int*/ atom = GDK.gdk_atom_intern(atomName, false); + long atom = GDK.gdk_atom_intern(atomName, false); GDK.gdk_selection_owner_set(GTK.gtk_widget_get_window(shellHandle), atom, OS.CurrentTime, false); GDK.gdk_selection_owner_get(atom); @@ -1154,8 +1154,8 @@ void createDisplay (DeviceData data) { keysChangedCallback = new Callback (this, "keysChangedProc", 2); //$NON-NLS-1$ keysChangedProc = keysChangedCallback.getAddress (); if (keysChangedProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); - long /*int*/ keymap; - long /*int*/ display = GDK.gdk_display_get_default(); + long keymap; + long display = GDK.gdk_display_get_default(); if (GTK.GTK4) { keymap = GDK.gdk_display_get_keymap(display); } else { @@ -1173,8 +1173,8 @@ void createDisplay (DeviceData data) { private int findLatinKeyGroup () { int result = 0; groupKeysCount = new HashMap<> (); - long /*int*/ keymap; - long /*int*/ display = GDK.gdk_display_get_default(); + long keymap; + long display = GDK.gdk_display_get_default(); if (GTK.GTK4) { keymap = GDK.gdk_display_get_keymap(display); } else { @@ -1234,20 +1234,20 @@ Map getGroupKeysCount () { * 'keys-changed' event handler. * Updates the most Latin keyboard layout group field. */ -long /*int*/ keysChangedProc (long /*int*/ keymap, long /*int*/ user_data) { +long keysChangedProc (long keymap, long user_data) { latinKeyGroup = findLatinKeyGroup (); return 0; } Image createImage (String name) { byte[] buffer = Converter.wcsToMbcs (name, true); - long /*int*/ pixbuf = GTK.gtk_icon_theme_load_icon(GTK.gtk_icon_theme_get_default(), buffer, 48, GTK.GTK_ICON_LOOKUP_FORCE_SIZE, 0); + long pixbuf = GTK.gtk_icon_theme_load_icon(GTK.gtk_icon_theme_get_default(), buffer, 48, GTK.GTK_ICON_LOOKUP_FORCE_SIZE, 0); if (pixbuf == 0) return null; int width = GDK.gdk_pixbuf_get_width (pixbuf); int height = GDK.gdk_pixbuf_get_height (pixbuf); int stride = GDK.gdk_pixbuf_get_rowstride (pixbuf); boolean hasAlpha = GDK.gdk_pixbuf_get_has_alpha (pixbuf); - long /*int*/ pixels = GDK.gdk_pixbuf_get_pixels (pixbuf); + long pixels = GDK.gdk_pixbuf_get_pixels (pixbuf); byte [] data = new byte [stride * height]; C.memmove (data, pixels, data.length); OS.g_object_unref (pixbuf); @@ -1300,7 +1300,7 @@ protected void destroy () { void destroyDisplay () { } -long /*int*/ emissionProc (long /*int*/ ihint, long /*int*/ n_param_values, long /*int*/ param_values, long /*int*/ data) { +long emissionProc (long ihint, long n_param_values, long param_values, long data) { if (GTK.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) { GTK.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), GTK.GTK_TEXT_DIR_RTL); } @@ -1369,7 +1369,7 @@ void error (int code) { SWT.error (code); } -long /*int*/ eventProc (long /*int*/ event, long /*int*/ data) { +long eventProc (long event, long data) { /* * Use gdk_event_get_time() rather than event.time or * gtk_get_current_event_time(). If the event does not @@ -1431,7 +1431,7 @@ long /*int*/ eventProc (long /*int*/ event, long /*int*/ data) { * * @noreference This method is not intended to be referenced by clients. */ -public Widget findWidget (long /*int*/ handle) { +public Widget findWidget (long handle) { checkDevice (); return getWidget (handle); } @@ -1460,7 +1460,7 @@ public Widget findWidget (long /*int*/ handle) { * * @since 3.1 */ -public Widget findWidget (long /*int*/ handle, long /*int*/ id) { +public Widget findWidget (long handle, long id) { checkDevice (); return null; } @@ -1484,12 +1484,12 @@ public Widget findWidget (long /*int*/ handle, long /*int*/ id) { * * @since 3.3 */ -public Widget findWidget (Widget widget, long /*int*/ id) { +public Widget findWidget (Widget widget, long id) { checkDevice (); return null; } -static long /*int*/ rendererClassInitProc (long /*int*/ g_class, long /*int*/ class_data) { +static long rendererClassInitProc (long g_class, long class_data) { GtkCellRendererClass klass = new GtkCellRendererClass (); OS.memmove (klass, g_class); if (GTK.GTK4) { @@ -1502,8 +1502,8 @@ static long /*int*/ rendererClassInitProc (long /*int*/ g_class, long /*int*/ cl return 0; } -static long /*int*/ snapshotDrawProc (long /*int*/ handle, long /*int*/ snapshot) { +static long snapshotDrawProc (long handle, long snapshot) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) widget.snapshotToDraw(handle, snapshot); return 0; @@ -1515,33 +1515,33 @@ static long /*int*/ snapshotDrawProc (long /*int*/ handle, long /*int*/ snapshot return 0; } -static long /*int*/ rendererGetPreferredWidthProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ minimun_size, long /*int*/ natural_size) { +static long rendererGetPreferredWidthProc (long cell, long handle, long minimun_size, long natural_size) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) return widget.rendererGetPreferredWidthProc (cell, handle, minimun_size, natural_size); return 0; } -static long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ cr, long /*int*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { +static long rendererRenderProc (long cell, long cr, long handle, long background_area, long cell_area, long flags) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) return widget.rendererRenderProc (cell, cr, handle, background_area, cell_area, flags); return 0; } -static long /*int*/ rendererSnapshotProc (long /*int*/ cell, long /*int*/ snapshot, long /*int*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { +static long rendererSnapshotProc (long cell, long snapshot, long handle, long background_area, long cell_area, long flags) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) return widget.rendererSnapshotProc (cell, snapshot, handle, background_area, cell_area, flags); return 0; } -void flushExposes (long /*int*/ window, boolean all) { +void flushExposes (long window, boolean all) { if (OS.isX11()) { this.flushWindow = window; this.flushAll = all; - long /*int*/ xDisplay = GDK.gdk_x11_display_get_xdisplay(GDK.gdk_display_get_default()); - long /*int*/ xEvent = OS.g_malloc (XEvent.sizeof); + long xDisplay = GDK.gdk_x11_display_get_xdisplay(GDK.gdk_display_get_default()); + long xEvent = OS.g_malloc (XEvent.sizeof); OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0); OS.g_free (xEvent); this.flushWindow = 0; @@ -1614,12 +1614,12 @@ Rectangle getBoundsInPixels () { int monitorCount; Rectangle bounds = new Rectangle(0, 0, 0, 0); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default (); + long display = GDK.gdk_display_get_default (); monitorCount = GDK.gdk_display_get_n_monitors (display); if (monitorCount > 0) { GdkRectangle dest = new GdkRectangle (); for (int i = 0; i < monitorCount; i++) { - long /*int*/ monitor = GDK.gdk_display_get_monitor(display, i); + long monitor = GDK.gdk_display_get_monitor(display, i); GDK.gdk_monitor_get_geometry (monitor, dest); if (i == 0) { bounds.width = dest.width; @@ -1632,7 +1632,7 @@ Rectangle getBoundsInPixels () { return bounds; } } else { - long /*int*/ screen = GDK.gdk_screen_get_default(); + long screen = GDK.gdk_screen_get_default(); monitorCount = GDK.gdk_screen_get_n_monitors(screen); if (monitorCount > 0) { GdkRectangle dest = new GdkRectangle (); @@ -1669,7 +1669,7 @@ public static Display getCurrent () { int getCaretBlinkTime () { // checkDevice (); - long /*int*/ settings = GTK.gtk_settings_get_default (); + long settings = GTK.gtk_settings_get_default (); if (settings == 0) return 500; int [] buffer = new int [1]; OS.g_object_get (settings, GTK.gtk_cursor_blink, buffer, 0); @@ -1684,7 +1684,7 @@ int getCaretBlinkTime () { return buffer [0] / 2; } -long /*int*/ getClosure (int id) { +long getClosure (int id) { if (OS.GLIB_VERSION >= OS.VERSION(2, 36, 0) && ++closuresCount [id] >= 255) { if (closures [id] != 0) OS.g_closure_unref (closures [id]); closures [id] = OS.g_cclosure_new (closuresProc [id], id, 0); @@ -1710,9 +1710,9 @@ long /*int*/ getClosure (int id) { public Control getCursorControl () { checkDevice(); int[] x = new int[1], y = new int[1]; - long /*int*/ handle = 0; - long /*int*/ [] user_data = new long /*int*/ [1]; - long /*int*/ gdkResource; + long handle = 0; + long [] user_data = new long [1]; + long gdkResource; if (GTK.GTK4) { gdkResource = gdk_device_get_surface_at_position (x,y); } else { @@ -1732,13 +1732,13 @@ public Control getCursorControl () { * XQueryPointer to find the containing GDK window. */ if (!OS.isX11()) return null; - long /*int*/ gdkDisplay = GDK.gdk_display_get_default(); + long gdkDisplay = GDK.gdk_display_get_default(); if (OS.isX11()) { GDK.gdk_x11_display_error_trap_push(gdkDisplay); } int[] unusedInt = new int[1]; long /*int*/[] unusedPtr = new long /*int*/[1], buffer = new long /*int*/[1]; - long /*int*/ xWindow, xParent = OS.XDefaultRootWindow (xDisplay); + long xWindow, xParent = OS.XDefaultRootWindow (xDisplay); do { if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) { handle = 0; @@ -1746,7 +1746,7 @@ public Control getCursorControl () { } if ((xWindow = buffer [0]) != 0) { xParent = xWindow; - long /*int*/ gdkWindow = GDK.gdk_x11_window_lookup_for_display(gdkDisplay, xWindow); + long gdkWindow = GDK.gdk_x11_window_lookup_for_display(gdkDisplay, xWindow); if (gdkWindow != 0) { GDK.gdk_window_get_user_data (gdkWindow, user_data); if (user_data[0] != 0) handle = user_data[0]; @@ -1928,19 +1928,19 @@ public Object getData () { return data; } -long /*int*/ gtk_fixed_get_type () { +long gtk_fixed_get_type () { return fixed_type; } -long /*int*/ gtk_cell_renderer_text_get_type () { +long gtk_cell_renderer_text_get_type () { return text_renderer_type; } -long /*int*/ gtk_cell_renderer_pixbuf_get_type () { +long gtk_cell_renderer_pixbuf_get_type () { return pixbuf_renderer_type; } -long /*int*/ gtk_cell_renderer_toggle_get_type () { +long gtk_cell_renderer_toggle_get_type () { return toggle_renderer_type; } @@ -2281,12 +2281,12 @@ GdkRGBA gtk_css_parse_background (String css, String precise) { return rgba; } -String gtk_css_provider_to_string (long /*int*/ provider) { +String gtk_css_provider_to_string (long provider) { // Fetch the CSS in char/string format from the provider. if (provider == 0) { return ""; } - long /*int*/ str = GTK.gtk_css_provider_to_string(provider); + long str = GTK.gtk_css_provider_to_string(provider); if (str == 0) return ""; int length = C.strlen (str); byte [] buffer = new byte [length]; @@ -2413,7 +2413,7 @@ String gtk_rgba_to_css_string (GdkRGBA rgba) { // If we have a null RGBA, set it to the default COLOR_WIDGET_BACKGROUND. toConvert = COLOR_WIDGET_BACKGROUND_RGBA; } - long /*int*/ str = GDK.gdk_rgba_to_string (toConvert); + long str = GDK.gdk_rgba_to_string (toConvert); int length = C.strlen (str); byte [] buffer = new byte [length]; C.memmove (buffer, str, length); @@ -2428,8 +2428,8 @@ String gtk_rgba_to_css_string (GdkRGBA rgba) { * * @return a String representation of the widget's name */ -String gtk_widget_get_name(long /*int*/ handle) { - long /*int*/ str = GTK.gtk_widget_get_name (handle); +String gtk_widget_get_name(long handle) { + long str = GTK.gtk_widget_get_name (handle); String name; if (str == 0) { name = "*"; @@ -2450,8 +2450,8 @@ String gtk_widget_get_name(long /*int*/ handle) { * * @return a String representation of the widget's CSS name */ -String gtk_widget_class_get_css_name(long /*int*/ handle) { - long /*int*/ str = GTK.gtk_widget_class_get_css_name (GTK.GTK_WIDGET_GET_CLASS(handle)); +String gtk_widget_class_get_css_name(long handle) { + long str = GTK.gtk_widget_class_get_css_name (GTK.GTK_WIDGET_GET_CLASS(handle)); String name; if (str == 0) { name = "*"; @@ -2521,7 +2521,7 @@ public Menu getMenuBar () { public int getDismissalAlignment () { checkDevice (); int [] buffer = new int [1]; - long /*int*/ settings = GTK.gtk_settings_get_default (); + long settings = GTK.gtk_settings_get_default (); OS.g_object_get (settings, GTK.gtk_alternative_button_order, buffer, 0); return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT; } @@ -2540,7 +2540,7 @@ public int getDismissalAlignment () { */ public int getDoubleClickTime () { checkDevice (); - long /*int*/ settings = GTK.gtk_settings_get_default (); + long settings = GTK.gtk_settings_get_default (); int [] buffer = new int [1]; OS.g_object_get (settings, GTK.gtk_double_click_time, buffer, 0); return buffer [0]; @@ -2565,8 +2565,8 @@ public Control getFocusControl () { return focusControl; } if (activeShell == null) return null; - long /*int*/ shellHandle = activeShell.shellHandle; - long /*int*/ handle = GTK.gtk_window_get_focus (shellHandle); + long shellHandle = activeShell.shellHandle; + long handle = GTK.gtk_window_get_focus (shellHandle); if (handle == 0) return null; do { Widget widget = getWidget (handle); @@ -2672,7 +2672,7 @@ Rectangle getWorkArea() { return null; } byte[] name = Converter.wcsToMbcs ("_NET_WORKAREA", true); //$NON-NLS-1$ - long /*int*/ atom = GDK.gdk_atom_intern (name, true); + long atom = GDK.gdk_atom_intern (name, true); if (atom == GDK.GDK_NONE) return null; long /*int*/[] actualType = new long /*int*/[1]; int[] actualFormat = new int[1]; @@ -2709,14 +2709,14 @@ public Monitor [] getMonitors () { Monitor [] monitors = null; Rectangle workArea = DPIUtil.autoScaleDown (getWorkArea ()); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default (); + long display = GDK.gdk_display_get_default (); if (display != 0) { int monitorCount = GDK.gdk_display_get_n_monitors (display); if (monitorCount > 0) { monitors = new Monitor [monitorCount]; GdkRectangle dest = new GdkRectangle (); for (int i = 0; i < monitorCount; i++) { - long /*int*/ gdkMonitor = GDK.gdk_display_get_monitor(display, i); + long gdkMonitor = GDK.gdk_display_get_monitor(display, i); GDK.gdk_monitor_get_geometry (gdkMonitor, dest); Monitor monitor = new Monitor (); monitor.handle = i; @@ -2744,7 +2744,7 @@ public Monitor [] getMonitors () { } } } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); if (screen != 0) { int monitorCount = GDK.gdk_screen_get_n_monitors (screen); if (monitorCount > 0) { @@ -2814,9 +2814,9 @@ public Monitor getPrimaryMonitor () { //attempt to find actual primary monitor if one is configured: if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); - long /*int*/ monitor = GDK.gdk_display_get_primary_monitor(display); - long /*int*/ toCompare; + long display = GDK.gdk_display_get_default(); + long monitor = GDK.gdk_display_get_primary_monitor(display); + long toCompare; for (int i = 0; i < monitors.length; i++) { toCompare = GDK.gdk_display_get_monitor(display, i); if (toCompare == monitor) { @@ -2824,7 +2824,7 @@ public Monitor getPrimaryMonitor () { } } } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); if (screen != 0) { //if no primary monitor is configured by the user, this returns 0. primaryMonitorIndex = GDK.gdk_screen_get_primary_monitor (screen); @@ -3174,7 +3174,7 @@ GdkRGBA toGdkRGBA (GdkRGBA rgba, double brightness) { return newRGBA; } -GdkRGBA getBackgroundColor (long /*int*/ context, int state) { +GdkRGBA getBackgroundColor (long context, int state) { /* * Draw the context background to an offset screen surface and get the color * in the middle of the surface. @@ -3182,8 +3182,8 @@ GdkRGBA getBackgroundColor (long /*int*/ context, int state) { GdkRGBA rgba = new GdkRGBA (); GTK.gtk_style_context_save (context); GTK.gtk_style_context_set_state (context, state); - long /*int*/ surface = Cairo.cairo_image_surface_create (Cairo.CAIRO_FORMAT_RGB24, 1, 1); - long /*int*/ cairo = Cairo.cairo_create (surface); + long surface = Cairo.cairo_image_surface_create (Cairo.CAIRO_FORMAT_RGB24, 1, 1); + long cairo = Cairo.cairo_create (surface); GTK.gtk_render_background (context, cairo, -50, -50, 100, 100); Cairo.cairo_fill (cairo); Cairo.cairo_surface_flush (surface); @@ -3246,7 +3246,7 @@ void initializeSystemColors () { byte [] darkBuffer = OS.GTK_THEME_DARK ? darkBuffer = Converter.wcsToMbcs ("dark", true) : null; // Fetch the actual theme in char/string format - long /*int*/ themeProvider = GTK.gtk_css_provider_get_named(buffer, darkBuffer); + long themeProvider = GTK.gtk_css_provider_get_named(buffer, darkBuffer); String cssOutput = gtk_css_provider_to_string(themeProvider); @@ -3472,7 +3472,7 @@ void initializeSystemColorsTooltip(String cssOutput) { return; } -GdkRGBA styleContextGetColor(long /*int*/ context, int flag) { +GdkRGBA styleContextGetColor(long context, int flag) { /* * Feature in GTK: we need to handle calls to gtk_style_context_get_color() * differently due to changes in GTK3.18+. This solves failing test cases @@ -3562,10 +3562,10 @@ public boolean getTouchEnabled() { return false; } -Widget getWidget (long /*int*/ handle) { +Widget getWidget (long handle) { if (handle == 0) return null; if (lastWidget != null && lastHandle == handle) return lastWidget; - long /*int*/ index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1; + long index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1; if (0 <= index && index < widgetTable.length) { lastHandle = handle; return lastWidget = widgetTable [(int)/*64*/index]; @@ -3573,7 +3573,7 @@ Widget getWidget (long /*int*/ handle) { return null; } -long /*int*/ idleProc (long /*int*/ data) { +long idleProc (long data) { boolean result = runAsyncMessages (false); if (!result) { synchronized (idleLock) { @@ -3604,9 +3604,9 @@ protected void init () { } void initializeCallbacks () { - closures = new long /*int*/ [Widget.LAST_SIGNAL]; + closures = new long [Widget.LAST_SIGNAL]; closuresCount = new int[Widget.LAST_SIGNAL]; - closuresProc = new long /*int*/ [Widget.LAST_SIGNAL]; + closuresProc = new long [Widget.LAST_SIGNAL]; signalIds = new int [Widget.LAST_SIGNAL]; /* Cache signals for GtkWidget */ @@ -3636,7 +3636,7 @@ void initializeCallbacks () { * SWT_MENU_LOCATION_DEBUGGING environment variable. */ if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0) && OS.SWT_MENU_LOCATION_DEBUGGING) { - long /*int*/ menuType = GTK.GTK_TYPE_MENU (); + long menuType = GTK.GTK_TYPE_MENU (); OS.g_type_class_ref (menuType); signalIds [Widget.POPPED_UP] = OS.g_signal_lookup (OS.popped_up, menuType); } else { @@ -3914,33 +3914,33 @@ void initializeColorList() { void initializeSubclasses () { if (!GTK.GTK4) { - long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); - long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); + long pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); + long pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); pangoLayoutNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc)); OS.g_type_class_unref (pangoLayoutClass); - long /*int*/ imContextType = GTK.GTK_TYPE_IM_MULTICONTEXT (); - long /*int*/ imContextClass = OS.g_type_class_ref (imContextType); + long imContextType = GTK.GTK_TYPE_IM_MULTICONTEXT (); + long imContextClass = OS.g_type_class_ref (imContextType); imContextNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (imContextClass); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (imContextClass, OS.imContextNewProc_CALLBACK(imContextNewProc)); OS.g_type_class_unref (imContextClass); - long /*int*/ pangoFontFamilyType = OS.PANGO_TYPE_FONT_FAMILY (); - long /*int*/ pangoFontFamilyClass = OS.g_type_class_ref (pangoFontFamilyType); + long pangoFontFamilyType = OS.PANGO_TYPE_FONT_FAMILY (); + long pangoFontFamilyClass = OS.g_type_class_ref (pangoFontFamilyType); pangoFontFamilyNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoFontFamilyClass); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoFontFamilyClass, OS.pangoFontFamilyNewProc_CALLBACK(pangoFontFamilyNewProc)); OS.g_type_class_unref (pangoFontFamilyClass); - long /*int*/ pangoFontFaceType = OS.PANGO_TYPE_FONT_FACE (); - long /*int*/ pangoFontFaceClass = OS.g_type_class_ref (pangoFontFaceType); + long pangoFontFaceType = OS.PANGO_TYPE_FONT_FACE (); + long pangoFontFaceClass = OS.g_type_class_ref (pangoFontFaceType); pangoFontFaceNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoFontFaceClass); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoFontFaceClass, OS.pangoFontFaceNewProc_CALLBACK(pangoFontFaceNewProc)); OS.g_type_class_unref (pangoFontFaceClass); if (!OS.IsWin32) { /* TODO [win32] replace unixprint */ - long /*int*/ printerOptionWidgetType = GTK.gtk_printer_option_widget_get_type(); - long /*int*/ printerOptionWidgetClass = OS.g_type_class_ref (printerOptionWidgetType); + long printerOptionWidgetType = GTK.gtk_printer_option_widget_get_type(); + long printerOptionWidgetClass = OS.g_type_class_ref (printerOptionWidgetType); printerOptionWidgetNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (printerOptionWidgetClass); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (printerOptionWidgetClass, OS.printerOptionWidgetNewProc_CALLBACK(printerOptionWidgetNewProc)); OS.g_type_class_unref (printerOptionWidgetClass); @@ -3960,10 +3960,10 @@ void initializeSystemSettings () { * fix is to for the initializaion by creating * a temporary GtkEntry. */ - long /*int*/ entry = GTK.gtk_entry_new (); + long entry = GTK.gtk_entry_new (); GTK.gtk_widget_destroy (entry); int [] buffer2 = new int [1]; - long /*int*/ settings = GTK.gtk_settings_get_default (); + long settings = GTK.gtk_settings_get_default (); OS.g_object_get (settings, GTK.gtk_entry_select_on_focus, buffer2, 0); entrySelectOnFocus = buffer2 [0] != 0; } @@ -3979,9 +3979,9 @@ void initializeWindowManager () { /* Get the window manager name */ windowManager = ""; //$NON-NLS-1$ if (OS.isX11()) { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); if (screen != 0) { - long /*int*/ ptr2 = GDK.gdk_x11_screen_get_window_manager_name (screen); + long ptr2 = GDK.gdk_x11_screen_get_window_manager_name (screen); if (ptr2 != 0) { int length = C.strlen (ptr2); if (length > 0) { @@ -4010,7 +4010,7 @@ void initializeWindowManager () { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC (long /*int*/ hDC, GCData data) { +public void internal_dispose_GC (long hDC, GCData data) { Cairo.cairo_destroy (hDC); } @@ -4037,17 +4037,17 @@ public void internal_dispose_GC (long /*int*/ hDC, GCData data) { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC (GCData data) { +public long internal_new_GC (GCData data) { if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED); - long /*int*/ gc = 0; - long /*int*/ root = 0; + long gc = 0; + long root = 0; if (GTK.GTK4) { - long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_A8, data.width, data.height); + long surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_A8, data.width, data.height); gc = Cairo.cairo_create(surface); } else { root = GDK.gdk_get_default_root_window(); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ surface = GDK.gdk_window_create_similar_surface(root, Cairo.CAIRO_CONTENT_COLOR_ALPHA, data.width, data.height); + long surface = GDK.gdk_window_create_similar_surface(root, Cairo.CAIRO_CONTENT_COLOR_ALPHA, data.width, data.height); gc = Cairo.cairo_create(surface); } else { gc = GDK.gdk_cairo_create(root); @@ -4327,7 +4327,7 @@ Rectangle mapInPixels (Control from, Control to, int x, int y, int width, int he return rect; } -long /*int*/ mouseHoverProc (long /*int*/ handle) { +long mouseHoverProc (long handle) { Widget widget = getWidget (handle); // null the GSource id as our implementation always returns 0 so the hover is // hidden and this leads to the GSource to be destroyed @@ -4423,16 +4423,16 @@ public boolean post (Event event) { return true; } - long /*int*/ gdkDisplay = GDK.gdk_display_get_default(); - long /*int*/ gdkSeat = GDK.gdk_display_get_default_seat(gdkDisplay); - long /*int*/ gdkKeyboardDevice = GDK.gdk_seat_get_keyboard(gdkSeat); - long /*int*/ gdkPointerDevice = GDK.gdk_seat_get_pointer(gdkSeat); - long /*int*/ gdkWindow = GDK.gdk_get_default_root_window(); - long /*int*/ window_list = GDK.gdk_window_get_children(gdkWindow); + long gdkDisplay = GDK.gdk_display_get_default(); + long gdkSeat = GDK.gdk_display_get_default_seat(gdkDisplay); + long gdkKeyboardDevice = GDK.gdk_seat_get_keyboard(gdkSeat); + long gdkPointerDevice = GDK.gdk_seat_get_pointer(gdkSeat); + long gdkWindow = GDK.gdk_get_default_root_window(); + long window_list = GDK.gdk_window_get_children(gdkWindow); if (window_list != 0) { - long /*int*/ windows = window_list; + long windows = window_list; while (windows != 0) { - long /*int*/ curr_window = OS.g_list_data(windows); + long curr_window = OS.g_list_data(windows); int state = GDK.gdk_window_get_state(curr_window); if ((state & GDK.GDK_WINDOW_STATE_FOCUSED) != 0) { gdkWindow = curr_window; @@ -4444,7 +4444,7 @@ public boolean post (Event event) { OS.g_list_free(window_list); } if (gdkWindow == 0) return false; - long /*int*/ eventPtr = 0; + long eventPtr = 0; switch (type) { case SWT.KeyDown: @@ -4477,12 +4477,12 @@ public boolean post (Event event) { cachedModifierState = 0; } - long /*int*/ gdkKeymap = GDK.gdk_keymap_get_for_display(gdkDisplay); + long gdkKeymap = GDK.gdk_keymap_get_for_display(gdkDisplay); int hardware_keycode = 0; int raw_keyval = untranslateKey(event.keyCode); if (raw_keyval == 0) raw_keyval = event.character; - long /*int*/[] keys_list = new long /*int*/ [1]; + long /*int*/[] keys_list = new long [1]; int [] n_keys = new int [1]; int [] keyval = new int [1], effective_group = new int [1], level = new int [1], consumed_modifiers = new int[1]; int final_keyval = raw_keyval; @@ -4591,7 +4591,7 @@ void postEvent (Event event) { void putGdkEvents () { if (gdkEventCount != 0) { for (int i = 0; i < gdkEventCount; i++) { - long /*int*/ event = gdkEvents [i]; + long event = gdkEvents [i]; Widget widget = gdkEventWidgets [i]; if (widget == null || !widget.isDisposed ()) { GDK.gdk_event_put (event); @@ -4877,23 +4877,23 @@ void releaseDisplay () { keysChangedProc = 0; /* Dispose subclass */ - long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); - long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); + long pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); + long pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc); OS.g_type_class_unref (pangoLayoutClass); pangoLayoutNewProc = 0; - long /*int*/ imContextType = GTK.GTK_TYPE_IM_MULTICONTEXT (); - long /*int*/ imContextClass = OS.g_type_class_ref (imContextType); + long imContextType = GTK.GTK_TYPE_IM_MULTICONTEXT (); + long imContextClass = OS.g_type_class_ref (imContextType); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (imContextClass, imContextNewProc); OS.g_type_class_unref (imContextClass); imContextNewProc = 0; - long /*int*/ pangoFontFamilyType = OS.PANGO_TYPE_FONT_FAMILY (); - long /*int*/ pangoFontFamilyClass = OS.g_type_class_ref (pangoFontFamilyType); + long pangoFontFamilyType = OS.PANGO_TYPE_FONT_FAMILY (); + long pangoFontFamilyClass = OS.g_type_class_ref (pangoFontFamilyType); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoFontFamilyClass, pangoFontFamilyNewProc); OS.g_type_class_unref (pangoFontFamilyClass); pangoFontFamilyNewProc = 0; - long /*int*/ pangoFontFaceType = OS.PANGO_TYPE_FONT_FACE (); - long /*int*/ pangoFontFaceClass = OS.g_type_class_ref (pangoFontFaceType); + long pangoFontFaceType = OS.PANGO_TYPE_FONT_FACE (); + long pangoFontFaceClass = OS.g_type_class_ref (pangoFontFaceType); OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoFontFaceClass, pangoFontFaceNewProc); OS.g_type_class_unref (pangoFontFaceClass); pangoFontFaceNewProc = 0; @@ -4972,9 +4972,9 @@ public void removeFilter (int eventType, Listener listener) { if (filterTable.size () == 0) filterTable = null; } -long /*int*/ removeGdkEvent () { +long removeGdkEvent () { if (gdkEventCount == 0) return 0; - long /*int*/ event = gdkEvents [0]; + long event = gdkEvents [0]; --gdkEventCount; System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount); System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount); @@ -5023,7 +5023,7 @@ public void removeListener (int eventType, Listener listener) { eventTable.unhook (eventType, listener); } -void removeMouseHoverTimeout (long /*int*/ handle) { +void removeMouseHoverTimeout (long handle) { if (handle != mouseHoverHandle) return; if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId); mouseHoverId = 0; @@ -5040,12 +5040,12 @@ void removePopup (Menu menu) { } } -Widget removeWidget (long /*int*/ handle) { +Widget removeWidget (long handle) { if (handle == 0) return null; lastWidget = null; Widget widget = null; int index; - long /*int*/ data = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1; + long data = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1; if(data < 0 || data > Integer.MAX_VALUE) { SWT.error(SWT.ERROR_INVALID_RETURN_VALUE, null, ". g_object_get_qdata returned unexpected index value" + debugInfoForIndex(data)); } @@ -5066,7 +5066,7 @@ Widget removeWidget (long /*int*/ handle) { return widget; } -String debugInfoForIndex(long /*int*/ index) { +String debugInfoForIndex(long index) { String s = ", index: " + index; int idx = (int) index; if (idx >= 0 && idx < widgetTable.length) { @@ -5295,9 +5295,9 @@ public void setCursorLocation (int x, int y) { } void setCursorLocationInPixels (Point location) { - long /*int*/ gdkDisplay = GDK.gdk_display_get_default(); - long /*int*/ gdkScreen = GDK.gdk_screen_get_default(); - long /*int*/ gdkPointer = GDK.gdk_get_pointer(gdkDisplay); + long gdkDisplay = GDK.gdk_display_get_default(); + long gdkScreen = GDK.gdk_screen_get_default(); + long gdkPointer = GDK.gdk_get_pointer(gdkDisplay); GDK.gdk_device_warp(gdkPointer, gdkScreen, location.x, location.y); } @@ -5369,7 +5369,7 @@ public void setData (String key, Object value) { } if (key.equals (ADD_WIDGET_KEY)) { Object [] data = (Object []) value; - long /*int*/ handle = ((LONG) data [0]).value; + long handle = ((LONG) data [0]).value; Widget widget = (Widget) data [1]; if (widget != null) { addWidget (handle, widget); @@ -5458,10 +5458,10 @@ public void setData (Object data) { this.data = data; } -long /*int*/ setDirectionProc (long /*int*/ widget, long /*int*/ direction) { +long setDirectionProc (long widget, long direction) { GTK.gtk_widget_set_direction (widget, (int)/*64*/ direction); if (GTK.GTK_IS_MENU_ITEM (widget)) { - long /*int*/ submenu = GTK.gtk_menu_item_get_submenu (widget); + long submenu = GTK.gtk_menu_item_get_submenu (widget); if (submenu != 0) { GTK.gtk_widget_set_direction (submenu, (int)/*64*/ direction); GTK.gtk_container_forall (submenu, setDirectionProc, direction); @@ -5594,9 +5594,9 @@ void showIMWindow (Control control) { GTK.gtk_container_add (preeditWindow, preeditLabel); GTK.gtk_widget_show (preeditLabel); } - long /*int*/ [] preeditString = new long /*int*/ [1]; - long /*int*/ [] pangoAttrs = new long /*int*/ [1]; - long /*int*/ imHandle = control.imHandle (); + long [] preeditString = new long [1]; + long [] pangoAttrs = new long [1]; + long imHandle = control.imHandle (); GTK.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null); if (preeditString [0] != 0 && C.strlen (preeditString [0]) > 0) { Control widget = control.findBackgroundControl (); @@ -5651,7 +5651,7 @@ public boolean sleep () { fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds); } max_priority [0] = timeout [0] = 0; - long /*int*/ context = OS.g_main_context_default (); + long context = OS.g_main_context_default (); boolean result = false; do { if (OS.g_main_context_acquire (context)) { @@ -5662,7 +5662,7 @@ public boolean sleep () { allocated_nfds = nfds; fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds); } - long /*int*/ poll = OS.g_main_context_get_poll_func (context); + long poll = OS.g_main_context_get_poll_func (context); if (poll != 0) { if (nfds > 0 || timeout [0] != 0) { /* @@ -5757,7 +5757,7 @@ public void timerExec (int milliseconds, Runnable runnable) { } } -long /*int*/ timerProc (long /*int*/ i) { +long timerProc (long i) { if (timerList == null) return 0; int index = (int)/*64*/i; if (0 <= index && index < timerList.length) { @@ -5777,7 +5777,7 @@ long /*int*/ timerProc (long /*int*/ i) { return 0; } -long /*int*/ caretProc (long /*int*/ clientData) { +long caretProc (long clientData) { caretId = 0; if (currentCaret == null) { return 0; @@ -5808,13 +5808,13 @@ void resetCaretTiming() { } } -long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long sizeAllocateProc (long handle, long arg0, long user_data) { Widget widget = getWidget (user_data); if (widget == null) return 0; return widget.sizeAllocateProc (handle, arg0, user_data); } -long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long sizeRequestProc (long handle, long arg0, long user_data) { Widget widget = getWidget (user_data); if (widget == null) return 0; return widget.sizeRequestProc (handle, arg0, user_data); @@ -5924,7 +5924,7 @@ void setCurrentCaret (Caret caret) { caretId = OS.g_timeout_add (blinkRate, caretProc, 0); } -long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long shellMapProc (long handle, long arg0, long user_data) { Widget widget = getWidget (handle); if (widget == null) return 0; return widget.shellMapProc (handle, arg0, user_data); @@ -5964,7 +5964,7 @@ String simple_color_parser (String output, String value, int index) { return ""; } -long /*int*/ signalProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ user_data) { +long signalProc (long gobject, long arg1, long user_data) { switch((int)/*64*/user_data) { case STYLE_UPDATED: settingsChanged = true; @@ -6071,107 +6071,107 @@ void wakeThread () { wake = true; } -long /*int*/ enterMotionScrollProc (long /*int*/ controller, double x, double y, long /*int*/ user_data) { - long /*int*/ handle = GTK.gtk_event_controller_get_widget(controller); +long enterMotionScrollProc (long controller, double x, double y, long user_data) { + long handle = GTK.gtk_event_controller_get_widget(controller); Widget widget = getWidget (handle); if (widget == null) return 0; return widget.enterMotionScrollProc(handle, x, y, user_data); } -long /*int*/ focusProc (long /*int*/ controller, long /*int*/ user_data) { - long /*int*/ handle = GTK.gtk_event_controller_get_widget(controller); +long focusProc (long controller, long user_data) { + long handle = GTK.gtk_event_controller_get_widget(controller); Widget widget = getWidget (handle); if (widget == null) return 0; return widget.focusProc(handle, user_data); } -long /*int*/ keyPressReleaseProc (long /*int*/ controller, int keyval, int keycode, int state, long /*int*/ user_data) { - long /*int*/ handle = GTK.gtk_event_controller_get_widget(controller); +long keyPressReleaseProc (long controller, int keyval, int keycode, int state, long user_data) { + long handle = GTK.gtk_event_controller_get_widget(controller); Widget widget = getWidget (handle); if (widget == null) return 0; return widget.keyPressReleaseProc(handle, keyval, keycode, state, user_data); } -long /*int*/ gesturePressReleaseProc (long /*int*/ gesture, int n_press, double x, double y, long /*int*/ user_data) { - long /*int*/ handle = GTK.gtk_event_controller_get_widget(gesture); +long gesturePressReleaseProc (long gesture, int n_press, double x, double y, long user_data) { + long handle = GTK.gtk_event_controller_get_widget(gesture); Widget widget = getWidget (handle); if (widget == null) return 0; return widget.getsurePressReleaseProc (gesture, n_press, x, y, user_data); } -long /*int*/ leaveProc (long /*int*/ controller, long /*int*/ user_data) { - long /*int*/ handle = GTK.gtk_event_controller_get_widget(controller); +long leaveProc (long controller, long user_data) { + long handle = GTK.gtk_event_controller_get_widget(controller); Widget widget = getWidget (handle); if (widget == null) return 0; return widget.leaveProc(handle, user_data); } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { +long windowProc (long handle, long user_data) { Widget widget = getWidget (handle); if (widget == null) return 0; return widget.windowProc (handle, user_data); } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long user_data) { Widget widget = getWidget (handle); if (widget == null) return 0; return widget.windowProc (handle, arg0, user_data); } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long user_data) { Widget widget = getWidget (handle); if (widget == null) return 0; return widget.windowProc (handle, arg0, arg1, user_data); } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long arg2, long user_data) { Widget widget = getWidget (handle); if (widget == null) return 0; return widget.windowProc (handle, arg0, arg1, arg2, user_data); } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { Widget widget = getWidget (handle); if (widget == null) return 0; return widget.windowProc (handle, arg0, arg1, arg2, arg3, user_data); } -long /*int*/ windowTimerProc (long /*int*/ handle) { +long windowTimerProc (long handle) { Widget widget = getWidget (handle); if (widget == null) return 0; return widget.timerProc (handle); } -long /*int*/ gdk_window_get_device_position (long /*int*/ window, int[] x, int[] y, int[] mask) { - long /*int*/ display = 0; +long gdk_window_get_device_position (long window, int[] x, int[] y, int[] mask) { + long display = 0; if( window != 0) { display = GDK.gdk_window_get_display (window); } else { window = GDK.gdk_get_default_root_window (); display = GDK.gdk_window_get_display (window); } - long /*int*/ pointer = GDK.gdk_get_pointer (display); + long pointer = GDK.gdk_get_pointer (display); return GDK.gdk_window_get_device_position(window, pointer, x, y, mask); } -long /*int*/ gdk_surface_get_device_position (long /*int*/ surface, int[] x, int[] y, int[] mask) { - long /*int*/ display = 0; +long gdk_surface_get_device_position (long surface, int[] x, int[] y, int[] mask) { + long display = 0; if (surface != 0) { display = GDK.gdk_surface_get_display (surface); } - long /*int*/ pointer = GDK.gdk_get_pointer(display); + long pointer = GDK.gdk_get_pointer(display); return GDK.gdk_surface_get_device_position(surface, pointer, x, y, mask); } -long /*int*/ gdk_device_get_window_at_position (int[] win_x, int[] win_y) { - long /*int*/ display = GDK.gdk_display_get_default (); - long /*int*/ device = GDK.gdk_get_pointer(display); +long gdk_device_get_window_at_position (int[] win_x, int[] win_y) { + long display = GDK.gdk_display_get_default (); + long device = GDK.gdk_get_pointer(display); return GDK.gdk_device_get_window_at_position (device, win_x, win_y); } -long /*int*/ gdk_device_get_surface_at_position (int[] win_x, int[] win_y) { - long /*int*/ display = GDK.gdk_display_get_default (); - long /*int*/ device = GDK.gdk_get_pointer(display); +long gdk_device_get_surface_at_position (int[] win_x, int[] win_y) { + long display = GDK.gdk_display_get_default (); + long device = GDK.gdk_get_pointer(display); return GDK.gdk_device_get_surface_at_position (device, win_x, win_y); } @@ -6186,7 +6186,7 @@ long /*int*/ gdk_device_get_surface_at_position (int[] win_x, int[] win_y) { * @nooverride This method is not intended to be re-implemented or extended by clients. */ @Override -protected long /*int*/ gsettingsProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ user_data) { +protected long gsettingsProc (long gobject, long arg1, long user_data) { switch((int)/*64*/user_data) { case CHANGE_SCALEFACTOR: this.scaleFactor = getDeviceZoom (); @@ -6199,19 +6199,19 @@ protected long /*int*/ gsettingsProc (long /*int*/ gobject, long /*int*/ arg1, l return 0; } -static int _getDeviceZoom (long /*int*/ monitor_num) { +static int _getDeviceZoom (long monitor_num) { /* * We can hard-code 96 as gdk_screen_get_resolution will always return -1 * if gdk_screen_set_resolution has not been called. */ int dpi = 96; if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); - long /*int*/ monitor = GDK.gdk_display_get_monitor_at_point(display, 0, 0); + long display = GDK.gdk_display_get_default(); + long monitor = GDK.gdk_display_get_monitor_at_point(display, 0, 0); int scale = GDK.gdk_monitor_get_scale_factor(monitor); dpi = dpi * scale; } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); dpi = (int) GDK.gdk_screen_get_resolution (screen); if (dpi <= 0) dpi = 96; // gdk_screen_get_resolution returns -1 in case of error int scale = GDK.gdk_screen_get_monitor_scale_factor (screen, (int) monitor_num); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java index 22ee9327dd..ce777b75db 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java @@ -145,7 +145,7 @@ void createHandle (int index) { GTK.gtk_scrolled_window_set_policy (scrolledHandle, GTK.GTK_POLICY_NEVER, GTK.GTK_POLICY_AUTOMATIC); GTK.gtk_container_add (fixedHandle, scrolledHandle); GTK.gtk_container_add(scrolledHandle, handle); - long /*int*/ viewport = GTK.gtk_bin_get_child (scrolledHandle); + long viewport = GTK.gtk_bin_get_child (scrolledHandle); GTK.gtk_viewport_set_shadow_type (viewport, GTK.GTK_SHADOW_NONE); } else { GTK.gtk_container_add (fixedHandle, handle); @@ -190,12 +190,12 @@ void destroyItem (ExpandItem item) { } @Override -long /*int*/ eventHandle () { +long eventHandle () { return fixedHandle; } @Override -boolean forceFocus (long /*int*/ focusHandle) { +boolean forceFocus (long focusHandle) { if (lastFocus != null && lastFocus.setFocus ()) return true; for (int i = 0; i < itemCount; i++) { ExpandItem item = items [i]; @@ -309,9 +309,9 @@ int getSpacingInPixels () { } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_press_event (long widget, long event) { if (!hasFocus ()) return 0; - long /*int*/ result = super.gtk_key_press_event (widget, event); + long result = super.gtk_key_press_event (widget, event); if (result != 0) return result; int index = 0; while (index < itemCount) { @@ -371,14 +371,14 @@ void layoutItems (int index, boolean setScrollbar) { } @Override -long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { - long /*int*/ result = super.gtk_size_allocate (widget, allocation); +long gtk_size_allocate (long widget, long allocation) { + long result = super.gtk_size_allocate (widget, allocation); layoutItems (0, false); return result; } @Override -long /*int*/ parentingHandle () { +long parentingHandle () { return fixedHandle; } @@ -440,7 +440,7 @@ void setWidgetBackground () { } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); for (int i = 0; i < itemCount; i++) { items[i].setFontDescription (font); @@ -473,7 +473,7 @@ void setScrollbar () { ExpandItem item = items [itemCount - 1]; int maxHeight = item.y + getBandHeight () + spacing; if (item.expanded) maxHeight += item.height; - long /*int*/ adjustmentHandle = GTK.gtk_scrolled_window_get_vadjustment (scrolledHandle); + long adjustmentHandle = GTK.gtk_scrolled_window_get_vadjustment (scrolledHandle); GtkAdjustment adjustment = new GtkAdjustment (); gtk_adjustment_get (adjustmentHandle, adjustment); yCurrentScroll = (int)adjustment.value; @@ -495,7 +495,7 @@ void setScrollbar () { GTK.gtk_widget_get_allocation (fixedHandle, allocation); int width = allocation.width - spacing * 2; if (policy == GTK.GTK_POLICY_ALWAYS) { - long /*int*/ vHandle = 0; + long vHandle = 0; vHandle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle); GtkRequisition requisition = new GtkRequisition (); gtk_widget_get_preferred_size (vHandle, requisition); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java index c3e597acd8..338abb7e19 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java @@ -41,7 +41,7 @@ public class ExpandItem extends Item { ExpandBar parent; Control control; ImageList imageList; - long /*int*/ clientHandle, boxHandle, labelHandle, imageHandle; + long clientHandle, boxHandle, labelHandle, imageHandle; boolean expanded; int x, y, width, height; int imageHeight, imageWidth; @@ -346,7 +346,7 @@ int getPreferredWidth (GC gc) { } @Override -long /*int*/ gtk_activate (long /*int*/ widget) { +long gtk_activate (long widget) { Event event = new Event (); event.item = this; int type = GTK.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand; @@ -355,7 +355,7 @@ long /*int*/ gtk_activate (long /*int*/ widget) { } @Override -long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { +long gtk_event (long widget, long event) { if (!GTK.GTK4) return 0; int eventType = GDK.gdk_event_get_event_type(event); switch (eventType) { @@ -370,26 +370,26 @@ long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { setFocus (); return 0; } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { GTK.gtk_widget_set_can_focus (handle, false); parent.lastFocus = this; return 0; } @Override -long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { +long gtk_size_allocate (long widget, long allocation) { parent.layoutItems (0, false); return 0; } @Override -long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_enter_notify_event (long widget, long event) { parent.gtk_enter_notify_event(widget, event); return 0; } @@ -411,11 +411,11 @@ void hookEvents () { OS.g_signal_connect_closure_by_id (handle, display.signalIds [FOCUS_OUT_EVENT], 0, display.getClosure (FOCUS_OUT_EVENT), false); OS.g_signal_connect_closure (clientHandle, OS.size_allocate, display.getClosure (SIZE_ALLOCATE), true); if (GTK.GTK4) { - long /*int*/ motionController = GTK.gtk_event_controller_motion_new(); + long motionController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(handle, motionController); GTK.gtk_event_controller_set_propagation_phase(motionController, GTK.GTK_PHASE_TARGET); - long /*int*/ enterAddress = display.enterMotionScrollCallback.getAddress(); + long enterAddress = display.enterMotionScrollCallback.getAddress(); OS.g_signal_connect (motionController, OS.enter, enterAddress, ENTER); } else { OS.g_signal_connect_closure_by_id (handle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.getClosure (ENTER_NOTIFY_EVENT), false); @@ -570,7 +570,7 @@ public void setControl (Control control) { parent.layoutItems (0, true); } -long /*int*/ clientHandle () { +long clientHandle () { return clientHandle; } @@ -603,7 +603,7 @@ boolean setFocus () { return result; } -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { setFontDescription (handle, font); if (labelHandle != 0) setFontDescription (labelHandle, font); if (imageHandle != 0) setFontDescription (imageHandle, font); @@ -648,7 +648,7 @@ public void setImage (Image image) { if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); imageList = new ImageList (); int imageIndex = imageList.add (image); - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + long pixbuf = imageList.getPixbuf (imageIndex); gtk_image_set_from_gicon (imageHandle, pixbuf); if (text.length () == 0) GTK.gtk_widget_hide (labelHandle); GTK.gtk_widget_show (imageHandle); @@ -688,7 +688,7 @@ void showWidget (int index) { } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { +long windowProc (long handle, long user_data) { switch ((int)/*64*/user_data) { case ACTIVATE_INVERSE: { expanded = GTK.gtk_expander_get_expanded (handle); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java index 4b131777ac..5918789636 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java @@ -50,7 +50,7 @@ public class FileDialog extends Dialog { int filterIndex = -1; boolean overwrite = false; boolean uriMode; - long /*int*/ handle; + long handle; static final char SEPARATOR = File.separatorChar; static final char EXTENSION_SEPARATOR = ';'; static final char FILE_EXTENSION_SEPARATOR = '.'; @@ -107,7 +107,7 @@ String computeResultChooserDialog () { /* MULTI is only valid if the native dialog's action is Open */ fullPath = null; if ((style & SWT.MULTI) != 0) { - long /*int*/ list = 0; + long list = 0; if (uriMode) { list = GTK.gtk_file_chooser_get_uris (handle); } else { @@ -115,11 +115,11 @@ String computeResultChooserDialog () { } int listLength = OS.g_slist_length (list); fileNames = new String [listLength]; - long /*int*/ current = list; + long current = list; int writePos = 0; for (int i = 0; i < listLength; i++) { - long /*int*/ name = OS.g_slist_data (current); - long /*int*/ utf8Ptr = 0; + long name = OS.g_slist_data (current); + long utf8Ptr = 0; if (uriMode) { utf8Ptr = name; } else { @@ -128,8 +128,8 @@ String computeResultChooserDialog () { } if (name != utf8Ptr) OS.g_free (name); if (utf8Ptr != 0) { - long /*int*/ [] items_written = new long /*int*/ [1]; - long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + long [] items_written = new long [1]; + long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { int clength = (int)/*64*/items_written [0]; @@ -149,11 +149,11 @@ String computeResultChooserDialog () { } OS.g_slist_free (list); } else { - long /*int*/ utf8Ptr = 0; + long utf8Ptr = 0; if (uriMode) { utf8Ptr = GTK.gtk_file_chooser_get_uri (handle); } else { - long /*int*/ path = GTK.gtk_file_chooser_get_filename (handle); + long path = GTK.gtk_file_chooser_get_filename (handle); if (path != 0) { utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path); @@ -161,8 +161,8 @@ String computeResultChooserDialog () { } } if (utf8Ptr != 0) { - long /*int*/ [] items_written = new long /*int*/ [1]; - long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + long [] items_written = new long [1]; + long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { int clength = (int)/*64*/items_written [0]; @@ -176,9 +176,9 @@ String computeResultChooserDialog () { } } filterIndex = -1; - long /*int*/ filter = GTK.gtk_file_chooser_get_filter (handle); + long filter = GTK.gtk_file_chooser_get_filter (handle); if (filter != 0) { - long /*int*/ filterNamePtr = GTK.gtk_file_filter_get_name (filter); + long filterNamePtr = GTK.gtk_file_filter_get_name (filter); if (filterNamePtr != 0) { int length = C.strlen (filterNamePtr); byte[] buffer = new byte [length]; @@ -319,7 +319,7 @@ String openNativeChooserDialog () { assert GTK.GTK_VERSION >= OS.VERSION(3, 20, 0); byte [] titleBytes = Converter.wcsToMbcs (title, true); int action = (style & SWT.SAVE) != 0 ? GTK.GTK_FILE_CHOOSER_ACTION_SAVE : GTK.GTK_FILE_CHOOSER_ACTION_OPEN; - long /*int*/ shellHandle = parent.topHandle (); + long shellHandle = parent.topHandle (); Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); handle = GTK.gtk_file_chooser_native_new(titleBytes, shellHandle, action, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_NAMED_LABEL_CANCEL); if (handle == 0) error (SWT.ERROR_NO_HANDLES); @@ -331,7 +331,7 @@ String openNativeChooserDialog () { display.addIdleProc (); String answer = null; int signalId = 0; - long /*int*/ hookId = 0; + long hookId = 0; if ((style & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); @@ -361,7 +361,7 @@ String openChooserDialog () { int action = (style & SWT.SAVE) != 0 ? GTK.GTK_FILE_CHOOSER_ACTION_SAVE : GTK.GTK_FILE_CHOOSER_ACTION_OPEN; - long /*int*/ shellHandle = parent.topHandle (); + long shellHandle = parent.topHandle (); Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); if (display.getDismissalAlignment() == SWT.RIGHT) { handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, GTK.GTK_NAMED_LABEL_CANCEL, GTK.GTK_RESPONSE_CANCEL, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_RESPONSE_OK, 0); @@ -370,9 +370,9 @@ String openChooserDialog () { } if (handle == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_window_set_modal (handle, true); - long /*int*/ group = GTK.gtk_window_get_group(0); + long group = GTK.gtk_window_get_group(0); GTK.gtk_window_group_add_window (group, handle); - long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle); + long pixbufs = GTK.gtk_window_get_icon_list (shellHandle); if (pixbufs != 0) { GTK.gtk_window_set_icon_list (handle, pixbufs); OS.g_list_free (pixbufs); @@ -389,7 +389,7 @@ String openChooserDialog () { display.setModalDialog (this); } int signalId = 0; - long /*int*/ hookId = 0; + long hookId = 0; if ((style & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); @@ -440,7 +440,7 @@ void presetChooserDialog () { * to be true canonical path. So using realpath to convert the path to * true canonical path. */ - long /*int*/ ptr = OS.realpath (buffer, null); + long ptr = OS.realpath (buffer, null); if (ptr != 0) { GTK.gtk_file_chooser_set_current_folder (handle, ptr); OS.g_free (ptr); @@ -498,7 +498,7 @@ void presetChooserDialog () { * to be true canonical path. So using realpath to convert the path to * true canonical path. */ - long /*int*/ ptr = OS.realpath (buffer, null); + long ptr = OS.realpath (buffer, null); if (ptr != 0) { if (fileName.length() > 0) { GTK.gtk_file_chooser_set_filename (handle, ptr); @@ -518,10 +518,10 @@ void presetChooserDialog () { /* Set the extension filters */ if (filterNames == null) filterNames = new String [0]; if (filterExtensions == null) filterExtensions = new String [0]; - long /*int*/ initialFilter = 0; + long initialFilter = 0; for (int i = 0; i < filterExtensions.length; i++) { if (filterExtensions [i] != null) { - long /*int*/ filter = GTK.gtk_file_filter_new (); + long filter = GTK.gtk_file_filter_new (); if (filterNames.length > i && filterNames [i] != null) { byte [] name = Converter.wcsToMbcs (filterNames [i], true); GTK.gtk_file_filter_set_name (filter, name); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java index 9f79f988d9..f2e5665708 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java @@ -155,21 +155,21 @@ public RGB getRGB () { * */ public FontData open () { - long /*int*/ handle; + long handle; byte [] titleBytes; titleBytes = Converter.wcsToMbcs (title, true); Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); handle = GTK.gtk_font_chooser_dialog_new (titleBytes, 0); if (parent!=null) { - long /*int*/ shellHandle = parent.topHandle (); + long shellHandle = parent.topHandle (); GTK.gtk_window_set_transient_for(handle, shellHandle); } - long /*int*/ group = GTK.gtk_window_get_group(0); + long group = GTK.gtk_window_get_group(0); GTK.gtk_window_group_add_window (group, handle); GTK.gtk_window_set_modal (handle, true); if (fontData != null) { Font font = new Font (display, fontData); - long /*int*/ fontName = OS.pango_font_description_to_string (font.handle); + long fontName = OS.pango_font_description_to_string (font.handle); int length = C.strlen (fontName); byte [] buffer = new byte [length + 1]; C.memmove (buffer, fontName, length); @@ -184,7 +184,7 @@ public FontData open () { display.setModalDialog (this); } int signalId = 0; - long /*int*/ hookId = 0; + long hookId = 0; if ((style & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); @@ -207,12 +207,12 @@ public FontData open () { } boolean success = response == GTK.GTK_RESPONSE_OK; if (success) { - long /*int*/ fontName = GTK.gtk_font_chooser_get_font (handle); + long fontName = GTK.gtk_font_chooser_get_font (handle); int length = C.strlen (fontName); byte [] buffer = new byte [length + 1]; C.memmove (buffer, fontName, length); OS.g_free (fontName); - long /*int*/ fontDesc = OS.pango_font_description_from_string (buffer); + long fontDesc = OS.pango_font_description_from_string (buffer); Font font = Font.gtk_new (display, fontDesc); fontData = font.getFontData () [0]; OS.pango_font_description_free (fontDesc); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java index 8d0add7629..4b984feb7e 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java @@ -44,7 +44,7 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class Group extends Composite { - long /*int*/ clientHandle, labelHandle; + long clientHandle, labelHandle; String text = ""; // We use this to keep track of the foreground color GdkRGBA foreground; @@ -103,7 +103,7 @@ protected void checkSubclass () { } @Override -long /*int*/ clientHandle () { +long clientHandle () { return clientHandle; } @@ -168,7 +168,7 @@ GdkRGBA getContextBackgroundGdkRGBA () { if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { return super.getContextBackgroundGdkRGBA(); } else { - long /*int*/ context = GTK.gtk_widget_get_style_context (fixedHandle); + long context = GTK.gtk_widget_get_style_context (fixedHandle); GdkRGBA rgba = new GdkRGBA (); GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba); if ((state & BACKGROUND) == 0) { @@ -240,7 +240,7 @@ void enableWidget (boolean enabled) { } @Override -long /*int*/ eventHandle () { +long eventHandle () { /* * Bug 453827 - Group's events should be handled via it's internal * fixed container (clientHandle) and not via it's top level. @@ -294,7 +294,7 @@ boolean mnemonicMatch (char key) { } @Override -long /*int*/ parentingHandle() { +long parentingHandle() { /* * Bug 453827 - Children should be attached to the internal fixed * subcontainer (clienthandle) and not the top-level fixedHandle. @@ -323,7 +323,7 @@ void releaseWidget () { } @Override -void setBackgroundGdkRGBA(long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGdkRGBA(long handle, GdkRGBA rgba) { if (GTK.GTK_VERSION >= OS.VERSION(3, 18, 0)) { super.setBackgroundGdkRGBA(handle, rgba); } else { @@ -332,13 +332,13 @@ void setBackgroundGdkRGBA(long /*int*/ handle, GdkRGBA rgba) { } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); setFontDescription (labelHandle, font); } @Override -void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setForegroundGdkRGBA (long handle, GdkRGBA rgba) { if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) { super.setForegroundGdkRGBA(handle, rgba); return; @@ -448,14 +448,14 @@ int setBounds(int x, int y, int width, int height, boolean move, boolean resize) } @Override -long /*int*/ paintHandle() { +long paintHandle() { if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) { return super.paintHandle(); } else { if (GTK.GTK4) return clientHandle; - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); /* we draw all our children on the clientHandle*/ - long /*int*/ paintHandle = clientHandle; + long paintHandle = clientHandle; while (paintHandle != topHandle) { if (gtk_widget_get_has_surface_or_window (paintHandle)) break; paintHandle = GTK.gtk_widget_get_parent (paintHandle); @@ -465,15 +465,15 @@ long /*int*/ paintHandle() { } @Override -long /*int*/ paintWindow () { - long /*int*/ paintHandle = clientHandle; +long paintWindow () { + long paintHandle = clientHandle; GTK.gtk_widget_realize (paintHandle); return gtk_widget_get_window (paintHandle); } @Override -long /*int*/ paintSurface () { - long /*int*/ paintHandle = clientHandle; +long paintSurface () { + long paintHandle = clientHandle; GTK.gtk_widget_realize (paintHandle); return gtk_widget_get_surface (paintHandle); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java index e3e5b1ffc1..877c82afe7 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java @@ -246,15 +246,15 @@ public boolean getWideCaret () { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { if (!isInlineEnabled ()) return 0; - long /*int*/ imHandle = imHandle (); + long imHandle = imHandle (); if (imHandle != 0) GTK.gtk_im_context_reset (imHandle); return 0; } @Override -long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ textPtr) { +long gtk_commit (long imcontext, long textPtr) { if (!isInlineEnabled ()) return 0; boolean doit = true; ranges = null; @@ -284,14 +284,14 @@ long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ textPtr) { } @Override -long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { +long gtk_preedit_changed (long imcontext) { if (!isInlineEnabled ()) return 0; ranges = null; styles = null; commitCount = 0; - long /*int*/ imHandle = imHandle (); - long /*int*/ [] preeditString = new long /*int*/ [1]; - long /*int*/ [] pangoAttrs = new long /*int*/ [1]; + long imHandle = imHandle (); + long [] preeditString = new long [1]; + long [] pangoAttrs = new long [1]; int [] cursorPos = new int [1]; GTK.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos); caretOffset = cursorPos [0]; @@ -303,7 +303,7 @@ long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { chars = Converter.mbcsToWcs (buffer); if (pangoAttrs [0] != 0) { int count = 0; - long /*int*/ iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]); + long iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]); while (OS.pango_attr_iterator_next (iterator)) count++; OS.pango_attr_iterator_destroy (iterator); ranges = new int [count * 2]; @@ -318,7 +318,7 @@ long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { ranges [i * 2] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + start [0]); ranges [i * 2 + 1] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1; styles [i] = new TextStyle (null, null, null); - long /*int*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND); + long attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND); if (attr != 0) { OS.memmove (attrColor, attr, PangoAttrColor.sizeof); GdkRGBA rgba = new GdkRGBA (); @@ -409,7 +409,7 @@ long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { return 1; } -long /*int*/ imHandle () { +long imHandle () { return parent.imHandle (); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java index 4b8a33e663..82b52673f7 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java @@ -53,7 +53,7 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class Label extends Control { - long /*int*/ frameHandle, labelHandle, imageHandle, boxHandle; + long frameHandle, labelHandle, imageHandle, boxHandle; ImageList imageList; Image image; String text; @@ -117,7 +117,7 @@ void addRelation (Control control) { } @Override -Point computeNativeSize (long /*int*/ h, int wHint, int hHint, boolean changed) { +Point computeNativeSize (long h, int wHint, int hHint, boolean changed) { int width = wHint, height = hHint; /* * Feature in GTK3: Labels with long text have an extremely large natural width. @@ -158,7 +158,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && GTK.gtk_widget_get_visible (labelHandle); if (fixWrap || frameHandle != 0) forceResize (); if (fixWrap) { - long /*int*/ labelLayout = GTK.gtk_label_get_layout (labelHandle); + long labelLayout = GTK.gtk_label_get_layout (labelHandle); int pangoWidth = OS.pango_layout_get_width (labelLayout); if (wHint != SWT.DEFAULT) { OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE); @@ -202,11 +202,11 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { * muliple lines of text. */ if (hHint == SWT.DEFAULT && labelHandle != 0) { - long /*int*/ layout = GTK.gtk_label_get_layout (labelHandle); - long /*int*/ context = OS.pango_layout_get_context (layout); - long /*int*/ lang = OS.pango_context_get_language (context); - long /*int*/ font = getFontDescription (); - long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang); + long layout = GTK.gtk_label_get_layout (labelHandle); + long context = OS.pango_layout_get_context (layout); + long lang = OS.pango_context_get_language (context); + long font = getFontDescription (); + long metrics = OS.pango_context_get_metrics (context, font, lang); int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics)); int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics)); OS.pango_font_metrics_unref (metrics); @@ -306,12 +306,12 @@ void deregister () { } @Override -long /*int*/ eventHandle () { +long eventHandle () { return fixedHandle; } @Override -long /*int*/ cssHandle () { +long cssHandle () { if ((style & SWT.SEPARATOR) == 0) { return labelHandle; } @@ -458,7 +458,7 @@ void releaseWidget () { @Override void resizeHandle (int width, int height) { OS.swt_fixed_resize (GTK.gtk_widget_get_parent (fixedHandle), fixedHandle, width, height); - long /*int*/ child = frameHandle != 0 ? frameHandle : handle; + long child = frameHandle != 0 ? frameHandle : handle; Point sizes = resizeCalculationsGTK3 (child, width, height); width = sizes.x; height = sizes.y; @@ -581,7 +581,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); if (labelHandle != 0) setFontDescription (labelHandle, font); if (imageHandle != 0) setFontDescription (imageHandle, font); @@ -639,7 +639,7 @@ public void setImage (Image image) { if (image != null) { imageList = new ImageList (); int imageIndex = imageList.add (image); - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + long pixbuf = imageList.getPixbuf (imageIndex); gtk_image_set_from_gicon (imageHandle, pixbuf); GTK.gtk_widget_hide (labelHandle); GTK.gtk_widget_show (imageHandle); @@ -712,7 +712,7 @@ void showWidget () { } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long user_data) { /* * For Labels/Buttons, the first widget in the tree with a GdkWindow is SwtFixed. * Unfortunately this fails the check in !GTK_IS_CONTAINER check Widget.windowProc(). diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java index e8c9fa50f5..3147f53bd8 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java @@ -327,8 +327,8 @@ public String getText () { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_button_press_event (widget, event); +long gtk_button_press_event (long widget, long event) { + long result = super.gtk_button_press_event (widget, event); if (result != 0) return result; int eventType = GDK.gdk_event_get_event_type(event); eventType = fixGdkEventTypeValues(eventType); @@ -372,8 +372,8 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_button_release_event (widget, event); +long gtk_button_release_event (long widget, long event) { + long result = super.gtk_button_release_event (widget, event); if (result != 0) return result; if (focusIndex == -1) return result; int [] eventButton = new int [1]; @@ -400,9 +400,9 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { - long /*int*/ context = GTK.gtk_widget_get_style_context(widget); + long context = GTK.gtk_widget_get_style_context(widget); GtkAllocation allocation = new GtkAllocation(); GTK.gtk_widget_get_allocation (widget, allocation); int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width; @@ -415,8 +415,8 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { - long /*int*/ result = super.gtk_event_after (widget, gdkEvent); +long gtk_event_after (long widget, long gdkEvent) { + long result = super.gtk_event_after (widget, gdkEvent); int eventType = GDK.gdk_event_get_event_type(gdkEvent); switch (eventType) { case GDK.GDK_FOCUS_CHANGE: @@ -427,8 +427,8 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_key_press_event (widget, eventPtr); +long gtk_key_press_event (long widget, long eventPtr) { + long result = super.gtk_key_press_event (widget, eventPtr); if (result != 0) return result; if (focusIndex == -1) return result; int [] key = new int[1]; @@ -458,8 +458,8 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { } @Override -long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_motion_notify_event (widget, event); +long gtk_motion_notify_event (long widget, long event) { + long result = super.gtk_motion_notify_event (widget, event); if (result != 0) return result; double [] eventX = new double [1]; double [] eventY = new double [1]; @@ -745,7 +745,7 @@ int setBounds(int x, int y, int width, int height, boolean move, boolean resize) } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); layout.setFont (Font.gtk_new (display, font)); } @@ -870,7 +870,7 @@ void styleLinkParts() { } @Override -int traversalCode(int key, long /*int*/ event) { +int traversalCode(int key, long event) { if (offsets.length == 0) return 0; int bits = super.traversalCode (key, event); if (key == GDK.GDK_Tab && focusIndex < offsets.length - 1) { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java index df9281f37c..11a1c48f47 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java @@ -42,7 +42,7 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class List extends Scrollable { - long /*int*/ modelHandle; + long modelHandle; int topIndex; int selectionCountOnPress,selectionCountOnRelease; @@ -105,7 +105,7 @@ public void add (String string) { checkWidget(); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); byte [] buffer = Converter.wcsToMbcs (string, true); - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED); GTK.gtk_list_store_append (modelHandle, iter); GTK.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1); @@ -146,7 +146,7 @@ public void add (String string, int index) { error (SWT.ERROR_INVALID_RANGE); } byte [] buffer = Converter.wcsToMbcs (string, true); - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED); /* * Feature in GTK. It is much faster to append to a list store @@ -209,14 +209,14 @@ void createHandle (int index) { * Columns: * 0 - text */ - long /*int*/ [] types = new long /*int*/ [] {OS.G_TYPE_STRING ()}; + long [] types = new long [] {OS.G_TYPE_STRING ()}; modelHandle = GTK.gtk_list_store_newv (types.length, types); if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES); handle = GTK.gtk_tree_view_new_with_model (modelHandle); if (handle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ textRenderer = GTK.gtk_cell_renderer_text_new (); + long textRenderer = GTK.gtk_cell_renderer_text_new (); if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ columnHandle = GTK.gtk_tree_view_column_new (); + long columnHandle = GTK.gtk_tree_view_column_new (); if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true); GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN); @@ -226,7 +226,7 @@ void createHandle (int index) { GTK.gtk_container_add (scrolledHandle, handle); int mode = (style & SWT.MULTI) != 0 ? GTK.GTK_SELECTION_MULTIPLE : GTK.GTK_SELECTION_BROWSE; - long /*int*/ selectionHandle = GTK.gtk_tree_view_get_selection (handle); + long selectionHandle = GTK.gtk_tree_view_get_selection (handle); GTK.gtk_tree_selection_set_mode (selectionHandle, mode); GTK.gtk_tree_view_set_headers_visible (handle, false); int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER; @@ -308,8 +308,8 @@ void deregister() { public void deselect (int index) { checkWidget(); if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0))) return; - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); GTK.gtk_tree_selection_unselect_iter (selection, iter); @@ -339,8 +339,8 @@ public void deselect (int start, int end) { if (start >= count && end >= count) return; start = Math.min (count - 1, Math.max (0, start)); end = Math.min (count - 1, Math.max (0, end)); - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); for (int index=start; index<=end; index++) { GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); @@ -370,9 +370,9 @@ public void deselect (int start, int end) { public void deselect (int [] indices) { checkWidget(); if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); for (int i=0; i=start; index--) { GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); @@ -1213,8 +1213,8 @@ public void remove (int [] indices) { if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); int last = -1; for (int i=0; i= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); for (int index=start; index<=end; index++) { GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); GTK.gtk_tree_selection_select_iter (selection, iter); if ((style & SWT.SINGLE) != 0) { - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); GTK.gtk_tree_view_set_cursor (handle, path, 0, false); GTK.gtk_tree_path_free (path); } @@ -1371,9 +1371,9 @@ public void select (int [] indices) { if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); int length = indices.length; if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return; - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); for (int i=0; i= OS.VERSION (3, 16, 0)) { GTK.gtk_label_set_xalign (labelHandle, 0); @@ -445,7 +445,7 @@ void createIMMenu (long /*int*/ imHandle) { } else { GTK.gtk_misc_set_alignment(labelHandle, 0, 0); } - long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0); + long boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0); if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); if (OS.SWT_PADDED_MENU_ITEMS) { imageHandle = GTK.gtk_image_new(); @@ -467,7 +467,7 @@ void createIMMenu (long /*int*/ imHandle) { GTK.gtk_widget_show (imItem); GTK.gtk_menu_shell_insert (handle, imItem, -1); } - long /*int*/ imSubmenu = GTK.gtk_menu_new (); + long imSubmenu = GTK.gtk_menu_new (); GTK.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu); GTK.gtk_menu_item_set_submenu (imItem, imSubmenu); } @@ -499,10 +499,10 @@ void fixMenus (Decorations newParent) { } int [] origin_x = new int [1], origin_y = new int [1]; if (GTK.GTK4) { - long /*int*/ surface = gtk_widget_get_surface (handle); + long surface = gtk_widget_get_surface (handle); GDK.gdk_surface_get_origin(surface, origin_x, origin_y); } else { - long /*int*/ window = gtk_widget_get_window (handle); + long window = gtk_widget_get_window (handle); GDK.gdk_window_get_origin (window, origin_x, origin_y); } GtkAllocation allocation = new GtkAllocation (); @@ -567,13 +567,13 @@ public boolean getEnabled () { */ public MenuItem getItem (int index) { checkWidget(); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM); int count = OS.g_list_length (list); if (imSeparator != 0) count--; if (imItem != 0) count--; if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); - long /*int*/ data = OS.g_list_nth_data (list, index); + long data = OS.g_list_nth_data (list, index); OS.g_list_free (list); if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM); return (MenuItem) display.getWidget (data); @@ -591,7 +591,7 @@ public MenuItem getItem (int index) { */ public int getItemCount () { checkWidget(); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return 0; int count = OS.g_list_length (list); OS.g_list_free (list); @@ -618,16 +618,16 @@ public int getItemCount () { */ public MenuItem [] getItems () { checkWidget(); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return new MenuItem [0]; - long /*int*/ originalList = list; + long originalList = list; int count = OS.g_list_length (list); if (imSeparator != 0) count--; if (imItem != 0) count--; MenuItem [] items = new MenuItem [count]; int index = 0; for (int i=0; i 0) { - long /*int*/ topLevelWidget = GTK.gtk_widget_get_toplevel(handle); + long topLevelWidget = GTK.gtk_widget_get_toplevel(handle); int width; if (GTK.GTK4) { - long /*int*/ topLevelSurface = GTK.gtk_widget_get_surface(topLevelWidget); + long topLevelSurface = GTK.gtk_widget_get_surface(topLevelWidget); width = GDK.gdk_surface_get_width(topLevelSurface); GDK.gdk_surface_resize(topLevelSurface, width, naturalHeight[0]); } else { - long /*int*/ topLevelWindow = GTK.gtk_widget_get_window(topLevelWidget); + long topLevelWindow = GTK.gtk_widget_get_window(topLevelWidget); width = GDK.gdk_window_get_width(topLevelWindow); GDK.gdk_window_resize(topLevelWindow, width, naturalHeight[0]); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java index 0a62cd6fdf..1d8dea5d57 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java @@ -41,7 +41,7 @@ import org.eclipse.swt.internal.gtk.*; */ public class MenuItem extends Item { Menu parent, menu; - long /*int*/ groupHandle, labelHandle, imageHandle; + long groupHandle, labelHandle, imageHandle; /** Feature in Gtk: as of Gtk version 3.10 GtkImageMenuItem is deprecated, * meaning that MenuItems in SWT with images can no longer be GtkImageMenuItems @@ -54,7 +54,7 @@ public class MenuItem extends Item { * https://developer.gnome.org/gtk3/stable/GtkImageMenuItem.html#GtkImageMenuItem.description * Bug 470298 */ - long /*int*/ boxHandle; + long boxHandle; int accelerator, userId; String toolTipText; @@ -145,11 +145,11 @@ public MenuItem (Menu parent, int style, int index) { createWidget (index); } -void addAccelerator (long /*int*/ accelGroup) { +void addAccelerator (long accelGroup) { updateAccelerator (accelGroup, true); } -void addAccelerators (long /*int*/ accelGroup) { +void addAccelerators (long accelGroup) { addAccelerator (accelGroup); if (menu != null) menu.addAccelerators (accelGroup); } @@ -279,7 +279,7 @@ void createHandle (int index) { if (groupHandle == 0) error (SWT.ERROR_NO_HANDLES); OS.g_object_ref (groupHandle); OS.g_object_ref_sink (groupHandle); - long /*int*/ group = GTK.gtk_radio_menu_item_get_group (groupHandle); + long group = GTK.gtk_radio_menu_item_get_group (groupHandle); handle = GTK.gtk_radio_menu_item_new (group); if (handle == 0) error (SWT.ERROR_NO_HANDLES); @@ -373,7 +373,7 @@ void createHandle (int index) { } GTK.gtk_accel_label_set_accel_widget (labelHandle, 0); } - long /*int*/ parentHandle = parent.handle; + long parentHandle = parent.handle; boolean enabled = GTK.gtk_widget_get_sensitive (parentHandle); if (!enabled) GTK.gtk_widget_set_sensitive (parentHandle, true); GTK.gtk_menu_shell_insert (parentHandle, handle, index); @@ -404,7 +404,7 @@ public int getAccelerator () { return accelerator; } -long /*int*/ getAccelGroup () { +long getAccelGroup () { Menu menu = parent; while (menu != null && menu.cascade != null) { menu = menu.cascade.parent; @@ -544,7 +544,7 @@ public String getToolTipText () { } @Override -long /*int*/ gtk_activate (long /*int*/ widget) { +long gtk_activate (long widget) { if ((style & SWT.CASCADE) != 0 && menu != null) return 0; /* * Bug in GTK. When an ancestor menu is disabled and @@ -564,14 +564,14 @@ long /*int*/ gtk_activate (long /*int*/ widget) { } @Override -long /*int*/ gtk_select (long /*int*/ item) { +long gtk_select (long item) { parent.selectedItem = this; sendEvent (SWT.Arm); return 0; } @Override -long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) { +long gtk_show_help (long widget, long helpType) { boolean handled = hooks (SWT.Help); if (handled) { postEvent (SWT.Help); @@ -634,7 +634,7 @@ void releaseParent () { @Override void releaseWidget () { super.releaseWidget (); - long /*int*/ accelGroup = getAccelGroup (); + long accelGroup = getAccelGroup (); if (accelGroup != 0) removeAccelerator (accelGroup); if (groupHandle != 0) OS.g_object_unref (groupHandle); groupHandle = 0; @@ -642,11 +642,11 @@ void releaseWidget () { parent = null; } -void removeAccelerator (long /*int*/ accelGroup) { +void removeAccelerator (long accelGroup) { updateAccelerator (accelGroup, false); } -void removeAccelerators (long /*int*/ accelGroup) { +void removeAccelerators (long accelGroup) { removeAccelerator (accelGroup); if (menu != null) menu.removeAccelerators (accelGroup); } @@ -758,7 +758,7 @@ void selectRadio () { public void setAccelerator (int accelerator) { checkWidget(); if (this.accelerator == accelerator) return; - long /*int*/ accelGroup = getAccelGroup (); + long accelGroup = getAccelGroup (); if (accelGroup != 0) removeAccelerator (accelGroup); this.accelerator = accelerator; if (accelGroup != 0) addAccelerator (accelGroup); @@ -780,7 +780,7 @@ public void setAccelerator (int accelerator) { public void setEnabled (boolean enabled) { checkWidget(); if (GTK.gtk_widget_get_sensitive (handle) == enabled) return; - long /*int*/ accelGroup = getAccelGroup (); + long accelGroup = getAccelGroup (); if (accelGroup != 0) removeAccelerator (accelGroup); GTK.gtk_widget_set_sensitive (handle, enabled); if (accelGroup != 0) addAccelerator (accelGroup); @@ -838,10 +838,10 @@ public void setImage (Image image) { } else { imageList.put (imageIndex, image); } - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + long pixbuf = imageList.getPixbuf (imageIndex); if (DPIUtil.useCairoAutoScale()) { Rectangle imgSize = image.getBounds(); - long /*int*/ scaledPixbuf = GDK.gdk_pixbuf_scale_simple(pixbuf, imgSize.width, imgSize.height, GDK.GDK_INTERP_BILINEAR); + long scaledPixbuf = GDK.gdk_pixbuf_scale_simple(pixbuf, imgSize.width, imgSize.height, GDK.GDK_INTERP_BILINEAR); if (scaledPixbuf !=0) { pixbuf = scaledPixbuf; } @@ -923,7 +923,7 @@ public void setMenu (Menu menu) { /* Assign the new menu */ Menu oldMenu = this.menu; if (oldMenu == menu) return; - long /*int*/ accelGroup = getAccelGroup (); + long accelGroup = getAccelGroup (); if (accelGroup != 0) removeAccelerators (accelGroup); if (oldMenu != null) { oldMenu.cascade = null; @@ -1085,7 +1085,7 @@ public void setToolTipText (String toolTip) { this.parent.getShell().setToolTipText (handle, (toolTipText = toolTip)); } -void updateAccelerator (long /*int*/ accelGroup, boolean add) { +void updateAccelerator (long accelGroup, boolean add) { if (accelerator == 0 || !getEnabled ()) return; if ((accelerator & SWT.COMMAND) != 0) return; int mask = 0; @@ -1178,7 +1178,7 @@ boolean updateAcceleratorText (boolean show) { } if (maskKeysym == null) return true; if (maskKeysym.keysym != 0) { - long /*int*/ accelGroup = getAccelGroup (); + long accelGroup = getAccelGroup (); if (show) { GTK.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, maskKeysym.keysym, maskKeysym.mask, GTK.GTK_ACCEL_VISIBLE); } else { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java index 3c2e79fed1..5b2746e9d1 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java @@ -44,7 +44,7 @@ import org.eclipse.swt.internal.gtk.*; public class MessageBox extends Dialog { String message = ""; - long /*int*/ handle; + long handle; /** * Constructs a new instance of this class given only its parent. * @@ -143,7 +143,7 @@ public void setMessage (String string) { * */ public int open () { - long /*int*/ parentHandle = (parent != null) ? parent.topHandle() : 0; + long parentHandle = (parent != null) ? parent.topHandle() : 0; int dialogFlags = GTK.GTK_DIALOG_DESTROY_WITH_PARENT; if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) { dialogFlags |= GTK.GTK_DIALOG_MODAL; @@ -158,7 +158,7 @@ public int open () { handle = GTK.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, format, buffer); if (handle == 0) error(SWT.ERROR_NO_HANDLES); if (parentHandle != 0) { - long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (parentHandle); + long pixbufs = GTK.gtk_window_get_icon_list (parentHandle); if (pixbufs != 0) { GTK.gtk_window_set_icon_list (handle, pixbufs); OS.g_list_free (pixbufs); @@ -175,7 +175,7 @@ public int open () { * parent shells, it is required to assign the * dialog to the same window group as of the shells. */ - long /*int*/ group = GTK.gtk_window_get_group(0); + long group = GTK.gtk_window_get_group(0); GTK.gtk_window_group_add_window (group, handle); if (GTK.gtk_window_get_modal (handle)) { @@ -183,7 +183,7 @@ public int open () { display.setModalDialog (this); } int signalId = 0; - long /*int*/ hookId = 0; + long hookId = 0; if ((style & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java index 974bef47a1..90f681cec8 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java @@ -100,7 +100,7 @@ void createHandle (int index) { } @Override -long /*int*/ eventHandle () { +long eventHandle () { return fixedHandle; } @@ -172,8 +172,8 @@ public int getState () { } @Override -long /*int*/ gtk_realize (long /*int*/ widget) { - long /*int*/ result = super.gtk_realize (widget); +long gtk_realize (long widget) { + long result = super.gtk_realize (widget); if (result != 0) return result; /* * Bug in GTK. When a progress bar has been unrealized after being @@ -191,7 +191,7 @@ long /*int*/ gtk_realize (long /*int*/ widget) { * 2 warnings. For this reason, do not perform GtkCSSNode calculations. */ @Override -Point resizeCalculationsGTK3 (long /*int*/ widget, int width, int height) { +Point resizeCalculationsGTK3 (long widget, int width, int height) { if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { // avoid warnings in GTK caused by too narrow progress bars width = Math.max(2, width); @@ -303,7 +303,7 @@ public void setState (int state) { } @Override -long /*int*/ timerProc (long /*int*/ widget) { +long timerProc (long widget) { if (isVisible ()) GTK.gtk_progress_bar_pulse (handle); return 1; } @@ -321,7 +321,7 @@ void updateBar (int selection, int minimum, int maximum) { GTK.gtk_progress_bar_set_fraction (handle, fraction); } -void gtk_orientable_set_orientation (long /*int*/ pbar, int orientation) { +void gtk_orientable_set_orientation (long pbar, int orientation) { switch (orientation) { case GTK.GTK_PROGRESS_BOTTOM_TO_TOP: GTK.gtk_orientable_set_orientation(pbar, GTK.GTK_ORIENTATION_VERTICAL); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java index e41ae46acf..469219c049 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java @@ -44,7 +44,7 @@ import org.eclipse.swt.internal.gtk.*; public class Sash extends Control { boolean dragging; int startX, startY, lastX, lastY; - long /*int*/ defaultCursor; + long defaultCursor; private final static int INCREMENT = 1; private final static int PAGE_INCREMENT = 9; @@ -167,8 +167,8 @@ void drawBand (int x, int y, int width, int height) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_button_press_event (widget, event); +long gtk_button_press_event (long widget, long event) { + long result = super.gtk_button_press_event (widget, event); if (result != 0) return result; // Event fields int [] eventButton = new int [1]; @@ -183,7 +183,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { if (button != 1) return 0; if (eventType == GDK.GDK_2BUTTON_PRESS) return 0; if (eventType == GDK.GDK_3BUTTON_PRESS) return 0; - long /*int*/ window = gtk_widget_get_window (widget); + long window = gtk_widget_get_window (widget); int [] origin_x = new int [1], origin_y = new int [1]; GDK.gdk_window_get_origin (window, origin_x, origin_y); startX = (int) (eventRX[0] - origin_x [0]); @@ -223,8 +223,8 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_button_release_event (widget, event); +long gtk_button_release_event (long widget, long event) { + long result = super.gtk_button_release_event (widget, event); if (result != 0) return result; int [] eventButton = new int [1]; GDK.gdk_event_get_button(event, eventButton); @@ -256,9 +256,9 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { - long /*int*/ context = GTK.gtk_widget_get_style_context(widget); + long context = GTK.gtk_widget_get_style_context(widget); GtkAllocation allocation = new GtkAllocation(); GTK.gtk_widget_get_allocation (widget, allocation); int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width; @@ -271,8 +271,8 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { } @Override -long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_focus_in_event (widget, event); +long gtk_focus_in_event (long widget, long event) { + long result = super.gtk_focus_in_event (widget, event); if (result != 0) return result; // widget could be disposed at this point if (handle != 0) { @@ -285,8 +285,8 @@ long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_key_press_event (widget, eventPtr); +long gtk_key_press_event (long widget, long eventPtr) { + long result = super.gtk_key_press_event (widget, eventPtr); if (result != 0) return result; int [] key = new int[1]; GDK.gdk_event_get_keyval(eventPtr, key); @@ -324,9 +324,9 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { if (newX == lastX && newY == lastY) return result; /* Ensure that the pointer image does not change */ - long /*int*/ gdkResource = GTK.GTK4? gtk_widget_get_surface (handle) : gtk_widget_get_window (handle); + long gdkResource = GTK.GTK4? gtk_widget_get_surface (handle) : gtk_widget_get_window (handle); int grabMask = GDK.GDK_POINTER_MOTION_MASK | GDK.GDK_BUTTON_RELEASE_MASK; - long /*int*/ gdkCursor = cursor != null ? cursor.handle : defaultCursor; + long gdkCursor = cursor != null ? cursor.handle : defaultCursor; int ptrGrabResult = gdk_pointer_grab (gdkResource, GDK.GDK_OWNERSHIP_NONE, false, grabMask, gdkResource, gdkCursor, GDK.GDK_CURRENT_TIME); /* The event must be sent because its doit flag is used. */ @@ -363,8 +363,8 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { } @Override -long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_motion_notify_event (widget, eventPtr); +long gtk_motion_notify_event (long widget, long eventPtr) { + long result = super.gtk_motion_notify_event (widget, eventPtr); if (result != 0) return result; if (!dragging) return 0; int eventX, eventY, eventState; @@ -373,7 +373,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr GDK.gdk_event_get_root_coords(eventPtr, fetchedX, fetchedY); int [] state = new int [1]; GDK.gdk_event_get_state(eventPtr, state); - long /*int*/ gdkResource = gdk_event_get_surface_or_window(eventPtr); + long gdkResource = gdk_event_get_surface_or_window(eventPtr); boolean isHint; if (GTK.GTK4) { isHint = false; @@ -449,7 +449,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr } @Override -long /*int*/ gtk_realize (long /*int*/ widget) { +long gtk_realize (long widget) { setCursor (cursor != null ? cursor.handle : 0); return super.gtk_realize (widget); } @@ -493,12 +493,12 @@ public void removeSelectionListener(SelectionListener listener) { } @Override -void setCursor (long /*int*/ cursor) { +void setCursor (long cursor) { super.setCursor (cursor != 0 ? cursor : defaultCursor); } @Override -int traversalCode (int key, long /*int*/ event) { +int traversalCode (int key, long event) { return 0; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java index 800b434945..60ec9c039a 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java @@ -131,7 +131,7 @@ void createHandle (int index) { fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); gtk_widget_set_has_surface_or_window (fixedHandle, true); - long /*int*/ hAdjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 0); + long hAdjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 0); if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES); if ((style & SWT.HORIZONTAL) != 0) { handle = GTK.gtk_scale_new (GTK.GTK_ORIENTATION_HORIZONTAL, hAdjustment); @@ -164,7 +164,7 @@ void hookEvents () { */ public int getIncrement () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_step_increment (hAdjustment); } @@ -180,7 +180,7 @@ public int getIncrement () { */ public int getMaximum () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_upper (hAdjustment); } @@ -196,7 +196,7 @@ public int getMaximum () { */ public int getMinimum () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_lower (hAdjustment); } @@ -214,7 +214,7 @@ public int getMinimum () { */ public int getPageIncrement () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_page_increment (hAdjustment); } @@ -230,12 +230,12 @@ public int getPageIncrement () { */ public int getSelection () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_value (hAdjustment); } @Override -long /*int*/ gtk_value_changed (long /*int*/ adjustment) { +long gtk_value_changed (long adjustment) { sendSelectionEvent (SWT.Selection); return 0; } @@ -371,7 +371,7 @@ public void setSelection (int value) { } @Override -Point resizeCalculationsGTK3(long /*int*/ widget, int width, int height) { +Point resizeCalculationsGTK3(long widget, int width, int height) { Point size = super.resizeCalculationsGTK3(widget, width, height); /* * Bug 534204: (GTK 3.22) Scale with GridLayout height hint has no line diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java index aba9803ebc..ca9aede38c 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java @@ -89,7 +89,7 @@ import org.eclipse.swt.internal.gtk.*; */ public class ScrollBar extends Widget { Scrollable parent; - long /*int*/ adjustmentHandle; + long adjustmentHandle; int detail; boolean dragSent; @@ -364,7 +364,7 @@ Rectangle getThumbBoundsInPixels () { Rectangle rect = new Rectangle(x, y, width, height); int [] origin_x = new int [1], origin_y = new int [1]; if (GTK.GTK4) { - long /*int*/ surface = gtk_widget_get_surface (parent.scrolledHandle); + long surface = gtk_widget_get_surface (parent.scrolledHandle); if (surface != 0) GDK.gdk_surface_get_origin (surface, origin_x, origin_y); rect.x += origin_x [0]; rect.y += origin_y [0]; @@ -373,7 +373,7 @@ Rectangle getThumbBoundsInPixels () { rect.x -= origin_x [0]; rect.y -= origin_y [0]; } else { - long /*int*/ window = gtk_widget_get_window (parent.scrolledHandle); + long window = gtk_widget_get_window (parent.scrolledHandle); if (window != 0) GDK.gdk_window_get_origin (window, origin_x, origin_y); rect.x += origin_x [0]; rect.y += origin_y [0]; @@ -459,7 +459,7 @@ Rectangle getThumbTrackBoundsInPixels () { Rectangle rect = new Rectangle(x, y, width, height); int [] origin_x = new int [1], origin_y = new int [1]; if (GTK.GTK4) { - long /*int*/ surface = gtk_widget_get_surface (parent.scrolledHandle); + long surface = gtk_widget_get_surface (parent.scrolledHandle); if (surface != 0) GDK.gdk_surface_get_origin (surface, origin_x, origin_y); rect.x += origin_x [0]; rect.y += origin_y [0]; @@ -468,7 +468,7 @@ Rectangle getThumbTrackBoundsInPixels () { rect.x -= origin_x [0]; rect.y -= origin_y [0]; } else { - long /*int*/ window = gtk_widget_get_window (parent.scrolledHandle); + long window = gtk_widget_get_window (parent.scrolledHandle); if (window != 0) GDK.gdk_window_get_origin (window, origin_x, origin_y); rect.x += origin_x [0]; rect.y += origin_y [0]; @@ -499,7 +499,7 @@ Rectangle getThumbTrackBoundsInPixels () { */ public boolean getVisible () { checkWidget (); - long /*int*/ scrolledHandle = parent.scrolledHandle; + long scrolledHandle = parent.scrolledHandle; int [] hsp = new int [1], vsp = new int [1]; GTK.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp); if ((style & SWT.HORIZONTAL) != 0) { @@ -510,7 +510,7 @@ public boolean getVisible () { } @Override -long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { +long gtk_event (long widget, long event) { if (!GTK.GTK4) return 0; int eventType = GDK.gdk_event_get_event_type(event); switch (eventType) { @@ -525,8 +525,8 @@ long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_button_press_event (widget, eventPtr); +long gtk_button_press_event (long widget, long eventPtr) { + long result = super.gtk_button_press_event (widget, eventPtr); if (result != 0) return result; detail = GTK.GTK_SCROLL_NONE; dragSent = false; @@ -534,17 +534,17 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) } @Override -long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) { +long gtk_change_value (long widget, long scroll, long value1, long value2) { detail = (int)/*64*/scroll; return 0; } -void gtk_range_get_slider_range (long /*int*/ widget, int [] slider_start, int [] slider_end) { +void gtk_range_get_slider_range (long widget, int [] slider_start, int [] slider_end) { GTK.gtk_range_get_slider_range (widget, slider_start, slider_end); } @Override -long /*int*/ gtk_value_changed (long /*int*/ adjustment) { +long gtk_value_changed (long adjustment) { Event event = new Event (); dragSent = detail == GTK.GTK_SCROLL_JUMP; switch (detail) { @@ -573,7 +573,7 @@ long /*int*/ gtk_value_changed (long /*int*/ adjustment) { } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { +long gtk_event_after (long widget, long gdkEvent) { int eventType = GDK.gdk_event_get_event_type(gdkEvent); eventType = Control.fixGdkEventTypeValues(eventType); switch (eventType) { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java index cac6b662ce..d4a8252ace 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java @@ -37,7 +37,7 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public abstract class Scrollable extends Control { - long /*int*/ scrolledHandle; + long scrolledHandle; ScrollBar horizontalBar, verticalBar; /** @@ -78,7 +78,7 @@ public Scrollable (Composite parent, int style) { super (parent, style); } -long /*int*/ clientHandle () { +long clientHandle () { return handle; } @@ -233,7 +233,7 @@ public Rectangle getClientArea () { Rectangle getClientAreaInPixels () { checkWidget (); forceResize (); - long /*int*/ clientHandle = clientHandle (); + long clientHandle = clientHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (clientHandle, allocation); int x = allocation.x; @@ -304,8 +304,8 @@ public ScrollBar getVerticalBar () { } @Override -long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_scroll_event (widget, eventPtr); +long gtk_scroll_event (long widget, long eventPtr) { + long result = super.gtk_scroll_event (widget, eventPtr); /* * Feature in GTK. Scrolled windows do not scroll if the scrollbars @@ -424,7 +424,7 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole super.redrawWidget (x, y, width, height, redrawAll, all, trim); if (!GTK.gtk_widget_get_realized (handle)) return; if (!trim) return; - long /*int*/ topHandle = topHandle (), paintHandle = paintHandle (); + long topHandle = topHandle (), paintHandle = paintHandle (); if (topHandle == paintHandle) return; GdkRectangle rect = new GdkRectangle (); if (redrawAll) { @@ -441,10 +441,10 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole rect.height = Math.max (0, height); } if (GTK.GTK4) { - long /*int*/ surface = gtk_widget_get_surface (topHandle); + long surface = gtk_widget_get_surface (topHandle); GDK.gdk_surface_invalidate_rect (surface, rect); } else { - long /*int*/ window = gtk_widget_get_window (topHandle); + long window = gtk_widget_get_window (topHandle); GDK.gdk_window_invalidate_rect (window, rect, all); } } @@ -479,7 +479,7 @@ void resizeHandle (int width, int height) { if (fixedHandle != 0) { OS.swt_fixed_resize (GTK.gtk_widget_get_parent(fixedHandle), fixedHandle, width, height); } - long /*int*/ child = scrolledHandle != 0 ? scrolledHandle : handle; + long child = scrolledHandle != 0 ? scrolledHandle : handle; Point sizes = resizeCalculationsGTK3 (child, width, height); width = sizes.x; height = sizes.y; @@ -493,7 +493,7 @@ void showWidget () { } @Override -long /*int*/ topHandle () { +long topHandle () { if (fixedHandle != 0) return fixedHandle; if (scrolledHandle != 0) return scrolledHandle; return super.topHandle (); @@ -510,17 +510,17 @@ int vScrollBarWidth() { private Point hScrollbarSize() { if (horizontalBar == null) return new Point(0, 0); - long /*int*/ vBarHandle = GTK.gtk_scrolled_window_get_hscrollbar (scrolledHandle); + long vBarHandle = GTK.gtk_scrolled_window_get_hscrollbar (scrolledHandle); return scrollBarSize(vBarHandle); } private Point vScrollBarSize() { if (verticalBar == null) return new Point(0, 0); - long /*int*/ vBarHandle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle); + long vBarHandle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle); return scrollBarSize(vBarHandle); } -private Point scrollBarSize(long /*int*/ scrollBarHandle) { +private Point scrollBarSize(long scrollBarHandle) { if (scrollBarHandle == 0) return new Point(0, 0); GtkRequisition requisition = new GtkRequisition(); /* diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index cf33a7019c..5fcdea87dd 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -122,7 +122,7 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class Shell extends Decorations { - long /*int*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup; + long shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup; boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center; int oldX, oldY, oldWidth, oldHeight; int minWidth, minHeight; @@ -263,7 +263,7 @@ public Shell (Display display, int style) { this (display, null, style, 0, false); } -Shell (Display display, Shell parent, int style, long /*int*/ handle, boolean embedded) { +Shell (Display display, Shell parent, int style, long handle, boolean embedded) { super (); checkSubclass (); if (display == null) display = Display.getCurrent (); @@ -386,7 +386,7 @@ public Shell (Shell parent, int style) { * * @noreference This method is not intended to be referenced by clients. */ -public static Shell gtk_new (Display display, long /*int*/ handle) { +public static Shell gtk_new (Display display, long handle) { return new Shell (display, null, SWT.NO_TRIM, handle, true); } @@ -409,7 +409,7 @@ public static Shell gtk_new (Display display, long /*int*/ handle) { * * @since 3.3 */ -public static Shell internal_new (Display display, long /*int*/ handle) { +public static Shell internal_new (Display display, long handle) { return new Shell (display, null, SWT.NO_TRIM, handle, false); } @@ -484,10 +484,10 @@ void adjustTrim () { int height = allocation.height; GdkRectangle rect = new GdkRectangle (); if (GTK.GTK4) { - long /*int*/ surface = gtk_widget_get_surface(shellHandle); + long surface = gtk_widget_get_surface(shellHandle); GDK.gdk_surface_get_frame_extents (surface, rect); } else { - long /*int*/ window = gtk_widget_get_window (shellHandle); + long window = gtk_widget_get_window (shellHandle); GDK.gdk_window_get_frame_extents (window, rect); } int trimWidth = Math.max (0, rect.width - width); @@ -555,7 +555,7 @@ void bringToTop (boolean force) { if (!force) { if (activeShell == null) return; if (!display.activePending) { - long /*int*/ focusHandle = GTK.gtk_window_get_focus (activeShell.shellHandle); + long focusHandle = GTK.gtk_window_get_focus (activeShell.shellHandle); if (focusHandle != 0 && !GTK.gtk_widget_has_focus (focusHandle)) return; } } @@ -580,7 +580,7 @@ void bringToTop (boolean force) { * window. The fix is to use XSetInputFocus() to force * the focus, or gtk_grab_add() for GTK > 3.20. */ - long /*int*/ gdkResource; + long gdkResource; if (GTK.GTK4) { gdkResource = gtk_widget_get_surface (shellHandle); } else { @@ -588,9 +588,9 @@ void bringToTop (boolean force) { } if ((xFocus || (style & SWT.ON_TOP) != 0)) { if (OS.isX11()) { - long /*int*/ gdkDisplay = GDK.gdk_window_get_display(gdkResource); - long /*int*/ xDisplay = GDK.gdk_x11_display_get_xdisplay(gdkDisplay); - long /*int*/ xWindow = GDK.gdk_x11_window_get_xid (gdkResource); + long gdkDisplay = GDK.gdk_window_get_display(gdkResource); + long xDisplay = GDK.gdk_x11_display_get_xdisplay(gdkDisplay); + long xWindow = GDK.gdk_x11_window_get_xid (gdkResource); GDK.gdk_x11_display_error_trap_push(gdkDisplay); /* Use CurrentTime instead of the last event time to ensure that the shell becomes active */ OS.XSetInputFocus (xDisplay, xWindow, OS.RevertToParent, OS.CurrentTime); @@ -598,13 +598,13 @@ void bringToTop (boolean force) { } else { if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { GTK.gtk_grab_add(shellHandle); - long /*int*/ gdkDisplay; + long gdkDisplay; if (GTK.GTK4) { gdkDisplay = GDK.gdk_surface_get_display(gdkResource); } else { gdkDisplay = GDK.gdk_window_get_display(gdkResource); } - long /*int*/ seat = GDK.gdk_display_get_default_seat(gdkDisplay); + long seat = GDK.gdk_display_get_default_seat(gdkDisplay); if (GTK.GTK4) { GDK.gdk_surface_show(gdkResource); } else { @@ -829,7 +829,7 @@ void createHandle (int index) { } @Override -long /*int*/ filterProc (long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) { +long filterProc (long xEvent, long gdkEvent, long data2) { if (!OS.isX11()) return 0; int eventType = OS.X_EVENT_TYPE (xEvent); if (eventType != OS.FocusOut && eventType != OS.FocusIn) return 0; @@ -935,28 +935,28 @@ void hookEvents () { OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [SIZE_ALLOCATE], 0, display.getClosure (SIZE_ALLOCATE), false); if (GTK.GTK4) { OS.g_signal_connect_closure (shellHandle, OS.close_request, display.getClosure (CLOSE_REQUEST), false); - long /*int*/ keyController = GTK.gtk_event_controller_key_new(); + long keyController = GTK.gtk_event_controller_key_new(); GTK.gtk_widget_add_controller(shellHandle, keyController); GTK.gtk_event_controller_set_propagation_phase(keyController, GTK.GTK_PHASE_TARGET); - long /*int*/ keyPressReleaseAddress = display.keyPressReleaseCallback.getAddress(); - long /*int*/ focusAddress = display.focusCallback.getAddress(); + long keyPressReleaseAddress = display.keyPressReleaseCallback.getAddress(); + long focusAddress = display.focusCallback.getAddress(); OS.g_signal_connect (keyController, OS.key_pressed, keyPressReleaseAddress, KEY_PRESSED); OS.g_signal_connect (keyController, OS.focus_in, focusAddress, FOCUS_IN); OS.g_signal_connect (keyController, OS.focus_out, focusAddress, FOCUS_OUT); - long /*int*/ enterLeaveController = GTK.gtk_event_controller_motion_new(); + long enterLeaveController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(shellHandle, enterLeaveController); - long /*int*/ enterMotionAddress = display.enterMotionScrollCallback.getAddress(); + long enterMotionAddress = display.enterMotionScrollCallback.getAddress(); OS.g_signal_connect (enterLeaveController, OS.enter, enterMotionAddress, ENTER); if (isCustomResize()) { - long /*int*/ motionController = GTK.gtk_event_controller_motion_new(); + long motionController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(shellHandle, motionController); GTK.gtk_event_controller_set_propagation_phase(motionController, GTK.GTK_PHASE_TARGET); OS.g_signal_connect (motionController, OS.motion, enterMotionAddress, MOTION); - long /*int*/ leaveAddress = display.leaveCallback.getAddress(); + long leaveAddress = display.leaveCallback.getAddress(); OS.g_signal_connect (enterLeaveController, OS.leave, leaveAddress, LEAVE); } } else { @@ -1034,12 +1034,12 @@ public void requestLayout () { } @Override -long /*int*/ topHandle () { +long topHandle () { return shellHandle; } @Override -long /*int*/ paintHandle () { +long paintHandle () { if (GTK.GTK4) { return handle; } else { @@ -1075,7 +1075,7 @@ void fixShell (Shell newShell, Control control) { } @Override -void fixStyle (long /*int*/ handle) { +void fixStyle (long handle) { } @Override @@ -1153,7 +1153,7 @@ public int getAlpha () { */ public int getAlpha () { checkWidget (); - long /*int*/ screen = GTK.gtk_widget_get_screen(shellHandle); + long screen = GTK.gtk_widget_get_screen(shellHandle); boolean composited = GDK.gdk_screen_is_composited(screen); if (composited) { return (int) (GTK.gtk_widget_get_opacity(shellHandle) * 255); @@ -1407,7 +1407,7 @@ public Shell [] getShells () { } @Override -long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { +long gtk_event (long widget, long event) { if (!GTK.GTK4) return 0; int eventType = GDK.gdk_event_get_event_type(event); switch (eventType) { @@ -1425,7 +1425,7 @@ long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { if (widget == shellHandle) { if (isCustomResize ()) { if (OS.isX11() && (style & SWT.ON_TOP) != 0 && (style & SWT.NO_FOCUS) == 0) { @@ -1454,7 +1454,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { * if it has editable fields and is running Wayland. Refer to bug 515773. */ if (requiresUngrab()) { - long /*int*/ seat = GDK.gdk_event_get_seat(event); + long seat = GDK.gdk_event_get_seat(event); GDK.gdk_seat_ungrab(seat); GTK.gtk_grab_remove(shellHandle); } @@ -1464,7 +1464,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) { +long gtk_configure_event (long widget, long event) { int [] x = new int [1], y = new int [1]; GTK.gtk_window_get_position (shellHandle, x, y); @@ -1483,19 +1483,19 @@ long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_close_request (long /*int*/ widget) { +long gtk_close_request (long widget) { if (isEnabled()) closeWidget (); return 1; } @Override -long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) { +long gtk_delete_event (long widget, long event) { if (isEnabled()) closeWidget (); return 1; } @Override -long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_enter_notify_event (long widget, long event) { if (widget != shellHandle) { return super.gtk_enter_notify_event (widget, event); } @@ -1503,15 +1503,15 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if (widget == shellHandle) { if (isCustomResize ()) { int [] width = new int [1]; int [] height = new int [1]; - long /*int*/ window = gtk_widget_get_window (widget); + long window = gtk_widget_get_window (widget); gdk_window_get_size (window, width, height); int border = gtk_container_get_border_width_or_margin (widget); - long /*int*/ context = GTK.gtk_widget_get_style_context (shellHandle); + long context = GTK.gtk_widget_get_style_context (shellHandle); //TODO draw shell frame on GTK3 GTK.gtk_style_context_save (context); GTK.gtk_render_frame (context, cairo, 0, 0, width [0], border); @@ -1531,7 +1531,7 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { } @Override -long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { +long gtk_focus (long widget, long directionType) { switch ((int)/*64*/directionType) { case GTK.GTK_DIR_TAB_FORWARD: case GTK.GTK_DIR_TAB_BACKWARD: @@ -1549,7 +1549,7 @@ long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { } @Override -long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_in_event (long widget, long event) { if (widget != shellHandle) { return super.gtk_focus_in_event (widget, event); } @@ -1564,7 +1564,7 @@ long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { if (widget != shellHandle) { return super.gtk_focus_out_event (widget, event); } @@ -1582,17 +1582,17 @@ long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_leave_notify_event (long widget, long event) { if (widget == shellHandle) { if (isCustomResize ()) { int [] state = new int [1]; GDK.gdk_event_get_state(event, state); if ((state[0] & GDK.GDK_BUTTON1_MASK) == 0) { if (GTK.GTK4) { - long /*int*/ surface = gtk_widget_get_surface (shellHandle); + long surface = gtk_widget_get_surface (shellHandle); GDK.gdk_surface_set_cursor(surface, 0); } else { - long /*int*/ window = gtk_widget_get_window (shellHandle); + long window = gtk_widget_get_window (shellHandle); GDK.gdk_window_set_cursor (window, 0); } display.resizeMode = 0; @@ -1604,7 +1604,7 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_map (long /*int*/ widget) { +long gtk_map (long widget) { // No "map-event" signal on GTK4, set mapped here instead if (GTK.GTK4) { mapped = true; @@ -1613,10 +1613,10 @@ long /*int*/ gtk_map (long /*int*/ widget) { } @Override -long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ directionType) { +long gtk_move_focus (long widget, long directionType) { Control control = display.getFocusControl (); if (control != null) { - long /*int*/ focusHandle = control.focusHandle (); + long focusHandle = control.focusHandle (); GTK.gtk_widget_child_focus (focusHandle, (int)/*64*/directionType); } OS.g_signal_stop_emission_by_name (shellHandle, OS.move_focus); @@ -1624,7 +1624,7 @@ long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ directionType) { } @Override -long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_motion_notify_event (long widget, long event) { if (widget == shellHandle) { if (isCustomResize ()) { int [] state = new int [1]; @@ -1693,7 +1693,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { GDK.gdk_event_get_coords(event, eventX, eventY); int mode = getResizeMode (eventX[0], eventY[0]); if (mode != display.resizeMode) { - long /*int*/ cursor; + long cursor; if (GTK.GTK4) { byte [] name; switch (mode) { @@ -1707,11 +1707,11 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { case GDK.GDK_RIGHT_SIDE: name = Converter.wcsToMbcs("e-resize", true); break; default: name = Converter.wcsToMbcs("none", true); break; } - long /*int*/ surface = gtk_widget_get_surface(shellHandle); + long surface = gtk_widget_get_surface(shellHandle); cursor = GDK.gdk_cursor_new_from_name(name, 0); GDK.gdk_surface_set_cursor(surface, cursor); } else { - long /*int*/ window = gtk_widget_get_window (shellHandle); + long window = gtk_widget_get_window (shellHandle); cursor = GDK.gdk_cursor_new_for_display (GDK.gdk_display_get_default(), mode); GDK.gdk_window_set_cursor (window, cursor); } @@ -1726,7 +1726,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_press_event (long widget, long event) { if (widget == shellHandle) { /* Stop menu mnemonics when the shell is disabled */ if ((state & DISABLED) != 0) return 1; @@ -1734,8 +1734,8 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { if (menuBar != null && !menuBar.isDisposed ()) { Control focusControl = display.getFocusControl (); if (focusControl != null && (focusControl.hooks (SWT.KeyDown) || focusControl.filters (SWT.KeyDown))) { - long /*int*/ [] accel = new long /*int*/ [1]; - long /*int*/ setting = GTK.gtk_settings_get_default (); + long [] accel = new long [1]; + long setting = GTK.gtk_settings_get_default (); OS.g_object_get (setting, GTK.gtk_menu_bar_accel, accel, 0); if (accel [0] != 0) { int [] keyval = new int [1]; @@ -1761,7 +1761,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { +long gtk_size_allocate (long widget, long allocation) { int width, height; int[] widthA = new int [1]; int[] heightA = new int [1]; @@ -1854,9 +1854,9 @@ private void updateDecorations(long /*int*/ gdkResource) { } @Override -long /*int*/ gtk_realize (long /*int*/ widget) { - long /*int*/ result = super.gtk_realize (widget); - long /*int*/ gdkResource; +long gtk_realize (long widget) { + long result = super.gtk_realize (widget); + long gdkResource; if (GTK.GTK4) { gdkResource = gtk_widget_get_surface (shellHandle); } else { @@ -1879,7 +1879,7 @@ long /*int*/ gtk_realize (long /*int*/ widget) { } @Override -long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) { +long gtk_window_state_event (long widget, long event) { GdkEventWindowState gdkEvent = new GdkEventWindowState (); OS.memmove (gdkEvent, event, GdkEventWindowState.sizeof); minimized = (gdkEvent.new_window_state & GDK.GDK_WINDOW_STATE_ICONIFIED) != 0; @@ -2126,7 +2126,7 @@ public void setAlpha (int alpha) { */ public void setAlpha (int alpha) { checkWidget (); - long /*int*/ screen = GTK.gtk_widget_get_screen(shellHandle); + long screen = GTK.gtk_widget_get_screen(shellHandle); boolean composited = GDK.gdk_screen_is_composited(screen); if (composited) { GTK.gtk_widget_set_opacity (shellHandle, (double) alpha / 255); @@ -2242,7 +2242,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize } @Override -void setCursor (long /*int*/ cursor) { +void setCursor (long cursor) { if (GTK.GTK4) { if (enableSurface != 0) { GDK.gdk_surface_set_cursor (enableSurface, cursor); @@ -2281,9 +2281,9 @@ public void setEnabled (boolean enabled) { cleanupEnableSurface(); } } else { - long /*int*/ parentHandle = shellHandle; + long parentHandle = shellHandle; GTK.gtk_widget_realize (parentHandle); - long /*int*/ surface = gtk_widget_get_surface (parentHandle); + long surface = gtk_widget_get_surface (parentHandle); Rectangle rect = getBoundsInPixels (); GdkRectangle gdkRectangle = new GdkRectangle (); gdkRectangle.width = rect.width; @@ -2303,9 +2303,9 @@ public void setEnabled (boolean enabled) { cleanupEnableWindow(); } } else { - long /*int*/ parentHandle = shellHandle; + long parentHandle = shellHandle; GTK.gtk_widget_realize (parentHandle); - long /*int*/ window = gtk_widget_get_window (parentHandle); + long window = gtk_widget_get_window (parentHandle); Rectangle rect = getBoundsInPixels (); GdkWindowAttr attributes = new GdkWindowAttr (); attributes.width = rect.width; @@ -2403,9 +2403,9 @@ void setInitialBounds () { } else { GdkRectangle dest = new GdkRectangle (); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); + long display = GDK.gdk_display_get_default(); if (display != 0) { - long /*int*/ monitor; + long monitor; if (GTK.GTK4) { monitor = GDK.gdk_display_get_monitor_at_surface(display, paintWindow()); } else { @@ -2416,7 +2416,7 @@ void setInitialBounds () { height = dest.height * 5 / 8; } } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); if (screen != 0) { if (GDK.gdk_screen_get_n_monitors (screen) > 1) { int monitorNumber = GDK.gdk_screen_get_monitor_at_window (screen, paintWindow ()); @@ -2459,13 +2459,13 @@ public void setMenuBar (Menu menu) { if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT); } if (menuBar != null) { - long /*int*/ menuHandle = menuBar.handle; + long menuHandle = menuBar.handle; GTK.gtk_widget_hide (menuHandle); destroyAccelGroup (); } menuBar = menu; if (menuBar != null) { - long /*int*/ menuHandle = menu.handle; + long menuHandle = menu.handle; GTK.gtk_widget_show (menuHandle); createAccelGroup (); menuBar.addAccelerators (accelGroup); @@ -2612,7 +2612,7 @@ public void setRegion (Region region) { } //copied from Region: -static void gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles) { +static void gdk_region_get_rectangles(long region, long /*int*/[] rectangles, int[] n_rectangles) { int num = Cairo.cairo_region_num_rectangles (region); if (n_rectangles != null) n_rectangles[0] = num; rectangles[0] = OS.g_malloc(GdkRectangle.sizeof * num); @@ -2626,9 +2626,9 @@ static Region mirrorRegion (Region region) { Region mirrored = new Region (region.getDevice ()); - long /*int*/ rgn = region.handle; + long rgn = region.handle; int [] nRects = new int [1]; - long /*int*/ [] rects = new long /*int*/ [1]; + long [] rects = new long [1]; gdk_region_get_rectangles (rgn, rects, nRects); Rectangle bounds = DPIUtil.autoScaleUp(region.getBounds ()); cairo_rectangle_int_t rect = new cairo_rectangle_int_t(); @@ -2838,7 +2838,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations) { } @Override -long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long shellMapProc (long handle, long arg0, long user_data) { mapped = true; display.dispatchEvents = null; return 0; @@ -2856,7 +2856,7 @@ void showWidget () { display.activeShell = this; display.activePending = true; } - long /*int*/ children = GTK.gtk_container_get_children (shellHandle), list = children; + long children = GTK.gtk_container_get_children (shellHandle), list = children; while (list != 0) { GTK.gtk_container_remove (shellHandle, OS.g_list_data (list)); list = OS.g_list_next(list); @@ -2870,7 +2870,7 @@ void showWidget () { } @Override -long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long sizeAllocateProc (long handle, long arg0, long user_data) { int offset = 16; int [] x = new int [1], y = new int [1]; if (GTK.GTK4) { @@ -2885,11 +2885,11 @@ long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*in y [0] += offset; GdkRectangle dest = new GdkRectangle (); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); - long /*int*/ monitor = GDK.gdk_display_get_monitor_at_point(display, x[0], y[0]); + long display = GDK.gdk_display_get_default(); + long monitor = GDK.gdk_display_get_monitor_at_point(display, x[0], y[0]); GDK.gdk_monitor_get_geometry(monitor, dest); } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); if (screen != 0) { int monitorNumber = GDK.gdk_screen_get_monitor_at_point (screen, x[0], y[0]); GDK.gdk_screen_get_monitor_geometry (screen, monitorNumber, dest); @@ -2910,7 +2910,7 @@ long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*in } @Override -long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long sizeRequestProc (long handle, long arg0, long user_data) { GTK.gtk_widget_hide (handle); return 0; } @@ -2964,7 +2964,7 @@ int trimWidth () { void updateModal () { if (OS.isX11() && GTK.GTK_IS_PLUG (shellHandle)) return; - long /*int*/ group = 0; + long group = 0; boolean isModalShell = false; if (display.getModalDialog () == null) { Shell modal = getModalShell (); @@ -3095,8 +3095,8 @@ void checkAndUnrabFocus () { * assumes that GdkSeat are the same for parent and child, which seems to be the case. */ if (requiresUngrab() && !isMappedToPopup() && grabbedFocus) { - long /*int*/ window = gtk_widget_get_window (shellHandle); - long /*int*/ seat = GDK.gdk_display_get_default_seat(GDK.gdk_window_get_display(window)); + long window = gtk_widget_get_window (shellHandle); + long seat = GDK.gdk_display_get_default_seat(GDK.gdk_window_get_display(window)); GDK.gdk_seat_ungrab(seat); GTK.gtk_grab_remove(shellHandle); grabbedFocus = false; @@ -3218,17 +3218,17 @@ void releaseWidget () { } } -void setToolTipText (long /*int*/ tipWidget, String string) { +void setToolTipText (long tipWidget, String string) { setToolTipText (tipWidget, tipWidget, string); } -void setToolTipText (long /*int*/ rootWidget, long /*int*/ tipWidget, String string) { +void setToolTipText (long rootWidget, long tipWidget, String string) { byte [] buffer = null; if (string != null && string.length () > 0) { char [] chars = fixMnemonic (string, false, true); buffer = Converter.wcsToMbcs (chars, true); } - long /*int*/ oldTooltip = GTK.gtk_widget_get_tooltip_text (rootWidget); + long oldTooltip = GTK.gtk_widget_get_tooltip_text (rootWidget); boolean same = false; if (buffer == null && oldTooltip == 0) { same = true; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java index ccdeb86d8b..3ffcb1385e 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java @@ -159,7 +159,7 @@ void createHandle (int index) { fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); gtk_widget_set_has_surface_or_window (fixedHandle, true); - long /*int*/ hAdjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10); + long hAdjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10); if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES); if ((style & SWT.HORIZONTAL) != 0) { handle = GTK.gtk_scrollbar_new (GTK.GTK_ORIENTATION_HORIZONTAL, hAdjustment); @@ -182,8 +182,8 @@ void createHandle (int index) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_button_press_event (widget, eventPtr); +long gtk_button_press_event (long widget, long eventPtr) { + long result = super.gtk_button_press_event (widget, eventPtr); if (result != 0) return result; detail = GTK.GTK_SCROLL_NONE; dragSent = false; @@ -191,13 +191,13 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) } @Override -long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) { +long gtk_change_value (long widget, long scroll, long value1, long value2) { detail = (int)/*64*/scroll; return 0; } @Override -long /*int*/ gtk_value_changed (long /*int*/ adjustment) { +long gtk_value_changed (long adjustment) { Event event = new Event (); dragSent = detail == GTK.GTK_SCROLL_JUMP; switch (detail) { @@ -224,7 +224,7 @@ long /*int*/ gtk_value_changed (long /*int*/ adjustment) { } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { +long gtk_event_after (long widget, long gdkEvent) { int eventType = GDK.gdk_event_get_event_type(gdkEvent); eventType = Control.fixGdkEventTypeValues(eventType); switch (eventType) { @@ -257,14 +257,14 @@ void hookEvents () { @Override void register () { super.register (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); display.addWidget (hAdjustment, this); } @Override void deregister () { super.deregister (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); display.removeWidget (hAdjustment); } @@ -297,7 +297,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { */ public int getIncrement () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_step_increment (hAdjustment); } @@ -313,7 +313,7 @@ public int getIncrement () { */ public int getMaximum () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_upper (hAdjustment); } @@ -329,7 +329,7 @@ public int getMaximum () { */ public int getMinimum () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_lower (hAdjustment); } @@ -347,7 +347,7 @@ public int getMinimum () { */ public int getPageIncrement () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_page_increment (hAdjustment); } @@ -363,7 +363,7 @@ public int getPageIncrement () { */ public int getSelection () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_value (hAdjustment); } @@ -379,7 +379,7 @@ public int getSelection () { */ public int getThumb () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); return (int) GTK.gtk_adjustment_get_page_size (hAdjustment); } @@ -444,7 +444,7 @@ public void setIncrement (int value) { */ public void setMaximum (int value) { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); GtkAdjustment adjustment = new GtkAdjustment (); gtk_adjustment_get (hAdjustment, adjustment); int minimum = (int) adjustment.lower; @@ -474,7 +474,7 @@ public void setMaximum (int value) { public void setMinimum (int value) { checkWidget (); if (value < 0) return; - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); GtkAdjustment adjustment = new GtkAdjustment (); gtk_adjustment_get (hAdjustment, adjustment); int maximum = (int) adjustment.upper; @@ -558,7 +558,7 @@ public void setSelection (int value) { public void setThumb (int value) { checkWidget (); if (value < 1) return; - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); GtkAdjustment adjustment = new GtkAdjustment (); gtk_adjustment_get (hAdjustment, adjustment); value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower)); @@ -599,7 +599,7 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i if (increment < 1) return; if (pageIncrement < 1) return; thumb = Math.min (thumb, maximum - minimum); - long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle); + long hAdjustment = GTK.gtk_range_get_adjustment (handle); GtkAdjustment adjustment = new GtkAdjustment (); adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb); adjustment.lower = (double) minimum; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java index 9e61baeee9..95c4b705a2 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java @@ -48,9 +48,9 @@ import org.eclipse.swt.internal.gtk.*; public class Spinner extends Composite { static final int MIN_ARROW_WIDTH = 6; int lastEventTime = 0; - long /*int*/ imContext; - long /*int*/ gdkEventKey = 0; - long /*int*/ entryHandle; + long imContext; + long gdkEventKey = 0; + long entryHandle; int fixStart = -1, fixEnd = -1; double climbRate = 1; @@ -213,8 +213,8 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0; if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0; GTK.gtk_widget_realize (handle); - long /*int*/ layout = GTK.gtk_entry_get_layout (GTK.GTK4 ? entryHandle : handle); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long layout = GTK.gtk_entry_get_layout (GTK.GTK4 ? entryHandle : handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); double upper = GTK.gtk_adjustment_get_upper (hAdjustment); int digits = GTK.gtk_spin_button_get_digits (handle); for (int i = 0; i < digits; i++) upper *= 10; @@ -231,7 +231,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { string = buffer.toString (); } byte [] buffer1 = Converter.wcsToMbcs (string, false); - long /*int*/ ptr = OS.pango_layout_get_text (layout); + long ptr = OS.pango_layout_get_text (layout); int length = C.strlen (ptr); byte [] buffer2 = new byte [length]; C.memmove (buffer2, ptr, length); @@ -254,7 +254,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) { int xborder = 0, yborder = 0; Rectangle trim = super.computeTrimInPixels (x, y, width, height); GtkBorder tmp = new GtkBorder(); - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); int state_flag = GTK.GTK_VERSION < OS.VERSION(3, 18, 0) ? GTK.GTK_STATE_FLAG_NORMAL : GTK.gtk_widget_get_state_flags(handle); gtk_style_context_get_padding(context, state_flag, tmp); if ((style & SWT.BORDER) != 0) { @@ -307,14 +307,14 @@ void createHandle (int index) { fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); gtk_widget_set_has_surface_or_window (fixedHandle, true); - long /*int*/ adjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 0); + long adjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 0); if (adjustment == 0) error (SWT.ERROR_NO_HANDLES); handle = GTK.gtk_spin_button_new (adjustment, climbRate, 0); if (handle == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_container_add (fixedHandle, handle); if (GTK.GTK4) { - long /*int*/ boxHandle = GTK.gtk_widget_get_first_child(handle); - long /*int*/ textHandle = GTK.gtk_widget_get_first_child(boxHandle); + long boxHandle = GTK.gtk_widget_get_first_child(handle); + long textHandle = GTK.gtk_widget_get_first_child(boxHandle); entryHandle = textHandle; } GTK.gtk_editable_set_editable (GTK.GTK4 ? entryHandle : handle, (style & SWT.READ_ONLY) == 0); @@ -353,31 +353,31 @@ GdkRGBA defaultBackground () { @Override void deregister () { super.deregister (); - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) display.removeWidget (imContext); } @Override -long /*int*/ eventWindow () { +long eventWindow () { return paintWindow (); } @Override -long /*int*/ eventSurface () { +long eventSurface () { return paintSurface (); } @Override -long /*int*/ enterExitHandle () { +long enterExitHandle () { return fixedHandle; } @Override -boolean filterKey (int keyval, long /*int*/ event) { +boolean filterKey (int keyval, long event) { int time = GDK.gdk_event_get_time (event); if (time != lastEventTime) { lastEventTime = time; - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { return GTK.gtk_im_context_filter_keypress (imContext, event); } @@ -396,7 +396,7 @@ void fixIM () { * filter has to be called by SWT. */ if (gdkEventKey != 0 && gdkEventKey != -1) { - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { GTK.gtk_im_context_filter_keypress (imContext, gdkEventKey); gdkEventKey = -1; @@ -428,7 +428,7 @@ int getBorderWidthInPixels () { */ public int getIncrement () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); int digits = GTK.gtk_spin_button_get_digits (handle); double value = GTK.gtk_adjustment_get_step_increment (hAdjustment); for (int i = 0; i < digits; i++) value *= 10; @@ -447,7 +447,7 @@ public int getIncrement () { */ public int getMaximum () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); int digits = GTK.gtk_spin_button_get_digits (handle); double value = GTK.gtk_adjustment_get_upper (hAdjustment); for (int i = 0; i < digits; i++) value *= 10; @@ -466,7 +466,7 @@ public int getMaximum () { */ public int getMinimum () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); int digits = GTK.gtk_spin_button_get_digits (handle); double value = GTK.gtk_adjustment_get_lower (hAdjustment); for (int i = 0; i < digits; i++) value *= 10; @@ -486,7 +486,7 @@ public int getMinimum () { */ public int getPageIncrement () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); int digits = GTK.gtk_spin_button_get_digits (handle); double value = GTK.gtk_adjustment_get_page_increment (hAdjustment); for (int i = 0; i < digits; i++) value *= 10; @@ -505,7 +505,7 @@ public int getPageIncrement () { */ public int getSelection () { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); int digits = GTK.gtk_spin_button_get_digits (handle); double value = GTK.gtk_adjustment_get_value (hAdjustment); for (int i = 0; i < digits; i++) value *= 10; @@ -528,7 +528,7 @@ public int getSelection () { */ public String getText () { checkWidget (); - long /*int*/ str = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); + long str = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); if (str == 0) return ""; int length = C.strlen (str); byte [] buffer = new byte [length]; @@ -575,7 +575,7 @@ public int getDigits () { } String getDecimalSeparator () { - long /*int*/ ptr = OS.localeconv_decimal_point (); + long ptr = OS.localeconv_decimal_point (); int length = C.strlen (ptr); byte [] buffer = new byte [length]; C.memmove (buffer, ptr, length); @@ -583,21 +583,21 @@ String getDecimalSeparator () { } @Override -long /*int*/ gtk_activate (long /*int*/ widget) { +long gtk_activate (long widget) { sendSelectionEvent (SWT.DefaultSelection); return 0; } @Override -long /*int*/ gtk_changed (long /*int*/ widget) { - long /*int*/ str = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); +long gtk_changed (long widget) { + long str = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); int length = C.strlen (str); if (length > 0) { - long /*int*/ [] endptr = new long /*int*/ [1]; + long [] endptr = new long [1]; double value = OS.g_strtod (str, endptr); int valueLength = (getDigits() == 0) ? String.valueOf((int)value).length() : String.valueOf(value).length(); if ((endptr [0] == str + length) && valueLength == length) { - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); GtkAdjustment adjustment = new GtkAdjustment (); gtk_adjustment_get (hAdjustment, adjustment); if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) { @@ -614,7 +614,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) { * is to post the modify event when the user is typing. */ boolean keyPress = false; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int eventType = GDK.gdk_event_get_event_type(eventPtr); eventType = fixGdkEventTypeValues(eventType); @@ -634,7 +634,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) { } @Override -long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) { +long gtk_commit (long imContext, long text) { if (text == 0) return 0; if (!GTK.gtk_editable_get_editable (GTK.GTK4? entryHandle : handle)) return 0; int length = C.strlen (text); @@ -673,9 +673,9 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) { } @Override -long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) { +long gtk_delete_text (long widget, long start_pos, long end_pos) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; - long /*int*/ ptr = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); + long ptr = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); @@ -699,19 +699,19 @@ long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { +long gtk_event_after (long widget, long gdkEvent) { if (cursor != null) setCursor (cursor.handle); return super.gtk_event_after (widget, gdkEvent); } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { fixIM (); return super.gtk_focus_out_event (widget, event); } @Override -long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) { +long gtk_insert_text (long widget, long new_text, long new_text_length, long position) { // if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text == 0 || new_text_length == 0) return 0; byte [] buffer = new byte [(int)/*64*/new_text_length]; @@ -719,7 +719,7 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long / String oldText = new String (Converter.mbcsToWcs (buffer)); int [] pos = new int [1]; C.memmove (pos, position, 4); - long /*int*/ ptr = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); + long ptr = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); int start = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, pos [0]); String newText = verifyText (oldText, start, start); @@ -752,8 +752,8 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long / } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result = super.gtk_key_press_event (widget, event); +long gtk_key_press_event (long widget, long event) { + long result = super.gtk_key_press_event (widget, event); if (result != 0) fixIM (); if (gdkEventKey == -1) result = 1; gdkEventKey = 0; @@ -761,7 +761,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { +long gtk_populate_popup (long widget, long menu) { if ((style & SWT.RIGHT_TO_LEFT) != 0) { GTK.gtk_widget_set_direction (menu, GTK.GTK_TEXT_DIR_RTL); GTK.gtk_container_forall (menu, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL); @@ -770,7 +770,7 @@ long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { } @Override -long /*int*/ gtk_value_changed (long /*int*/ widget) { +long gtk_value_changed (long widget) { sendSelectionEvent (SWT.Selection); return 0; } @@ -784,7 +784,7 @@ void hookEvents () { OS.g_signal_connect_closure (handle, OS.value_changed, display.getClosure (VALUE_CHANGED), false); OS.g_signal_connect_closure (handle, OS.activate, display.getClosure (ACTIVATE), false); OS.g_signal_connect_closure (handle, OS.populate_popup, display.getClosure (POPULATE_POPUP), false); - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { OS.g_signal_connect_closure (imContext, OS.commit, display.getClosure (COMMIT), false); int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ()); @@ -793,24 +793,24 @@ void hookEvents () { } } -long /*int*/ imContext () { +long imContext () { if (imContext != 0) return imContext; return 0; } @Override -long /*int*/ paintWindow () { - long /*int*/ window = super.paintWindow (); - long /*int*/ children = GDK.gdk_window_get_children (window); +long paintWindow () { + long window = super.paintWindow (); + long children = GDK.gdk_window_get_children (window); if (children != 0) window = OS.g_list_data (children); OS.g_list_free (children); return window; } @Override -long /*int*/ paintSurface () { - long /*int*/ surface = super.paintSurface (); - long /*int*/ children = GDK.gdk_surface_get_children (surface); +long paintSurface () { + long surface = super.paintSurface (); + long children = GDK.gdk_surface_get_children (surface); if (children != 0) surface = OS.g_list_data (children); OS.g_list_free (children); return surface; @@ -836,7 +836,7 @@ public void paste () { @Override void register () { super.register (); - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) display.addWidget (imContext, this); } @@ -928,7 +928,7 @@ GdkRGBA getContextBackgroundGdkRGBA () { } @Override -void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGdkRGBA (long context, long handle, GdkRGBA rgba) { background = rgba; setBackgroundGradientGdkRGBA (context, handle, rgba); } @@ -950,8 +950,8 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg } @Override -void setCursor (long /*int*/ cursor) { - long /*int*/ defaultCursor = 0; +void setCursor (long cursor) { + long defaultCursor = 0; if (cursor == 0) { if (GTK.GTK4) { byte [] name = Converter.wcsToMbcs("text", true); @@ -979,7 +979,7 @@ void setCursor (long /*int*/ cursor) { public void setIncrement (int value) { checkWidget (); if (value < 1) return; - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); double page_increment = GTK.gtk_adjustment_get_page_increment (hAdjustment); double newValue = value; int digits = GTK.gtk_spin_button_get_digits (handle); @@ -1004,7 +1004,7 @@ public void setIncrement (int value) { */ public void setMaximum (int value) { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); double lower = GTK.gtk_adjustment_get_lower (hAdjustment); double newValue = value; int digits = GTK.gtk_spin_button_get_digits (handle); @@ -1030,7 +1030,7 @@ public void setMaximum (int value) { */ public void setMinimum (int value) { checkWidget (); - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); double upper = GTK.gtk_adjustment_get_upper (hAdjustment); double newValue = value; int digits = GTK.gtk_spin_button_get_digits (handle); @@ -1056,7 +1056,7 @@ public void setMinimum (int value) { public void setPageIncrement (int value) { checkWidget (); if (value < 1) return; - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); double step_increment = GTK.gtk_adjustment_get_step_increment(hAdjustment); double newValue = value; int digits = GTK.gtk_spin_button_get_digits (handle); @@ -1142,7 +1142,7 @@ public void setDigits (int value) { if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT); int digits = GTK.gtk_spin_button_get_digits (handle); if (value == digits) return; - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); GtkAdjustment adjustment = new GtkAdjustment (); gtk_adjustment_get (hAdjustment, adjustment); int diff = Math.abs (value - digits); @@ -1210,7 +1210,7 @@ public void setValues (int selection, int minimum, int maximum, int digits, int */ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED); climbRate = 1.0 / factor; - long /*int*/ adjustment = GTK.gtk_spin_button_get_adjustment(handle); + long adjustment = GTK.gtk_spin_button_get_adjustment(handle); GTK.gtk_spin_button_configure (handle, adjustment, climbRate, digits); GTK.gtk_spin_button_set_range (handle, minimum / factor, maximum / factor); @@ -1225,15 +1225,15 @@ boolean checkSubwindow () { } @Override -boolean translateTraversal (long /*int*/ event) { +boolean translateTraversal (long event) { int [] key = new int[1]; GDK.gdk_event_get_keyval(event, key); switch (key[0]) { case GDK.GDK_KP_Enter: case GDK.GDK_Return: { - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { - long /*int*/ [] preeditString = new long /*int*/ [1]; + long [] preeditString = new long [1]; GTK.gtk_im_context_get_preedit_string (imContext, preeditString, null, null); if (preeditString [0] != 0) { int length = C.strlen (preeditString [0]); @@ -1252,7 +1252,7 @@ String verifyText (String string, int start, int end) { event.text = string; event.start = start; event.end = end; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int type = GDK.gdk_event_get_event_type(eventPtr); type = fixGdkEventTypeValues(type); @@ -1273,7 +1273,7 @@ String verifyText (String string, int start, int end) { index = 0; } if (string.length () > 0) { - long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); + long hAdjustment = GTK.gtk_spin_button_get_adjustment (handle); double lower = GTK.gtk_adjustment_get_lower (hAdjustment); if (lower < 0 && string.charAt (0) == '-') index++; } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java index b853f6b825..36f9c3aa28 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java @@ -175,7 +175,7 @@ public void addSelectionListener(SelectionListener listener) { } @Override -long /*int*/ clientHandle () { +long clientHandle () { int index = GTK.gtk_notebook_get_current_page (handle); if (index != -1 && items [index] != null) { return items [index].pageHandle; @@ -204,7 +204,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { Rectangle computeTrimInPixels (int x, int y, int width, int height) { checkWidget(); forceResize (); - long /*int*/ clientHandle = clientHandle (); + long clientHandle = clientHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (clientHandle, allocation); int clientX = allocation.x; @@ -271,7 +271,7 @@ void createWidget (int index) { } void createItem (TabItem item, int index) { - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); int itemCount = 0; if (list != 0) { itemCount = OS.g_list_length (list); @@ -283,15 +283,15 @@ void createItem (TabItem item, int index) { System.arraycopy (items, 0, newItems, 0, items.length); items = newItems; } - long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0); + long boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0); if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ labelHandle = GTK.gtk_label_new_with_mnemonic (null); + long labelHandle = GTK.gtk_label_new_with_mnemonic (null); if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ imageHandle = GTK.gtk_image_new (); + long imageHandle = GTK.gtk_image_new (); if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_container_add (boxHandle, imageHandle); GTK.gtk_container_add (boxHandle, labelHandle); - long /*int*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); + long pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES); OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE); GTK.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index); @@ -354,7 +354,7 @@ void destroyItem (TabItem item) { } @Override -long /*int*/ eventHandle () { +long eventHandle () { return handle; } @@ -368,10 +368,10 @@ Control[] _getChildren() { for (int j = 0; j < count; j++) { TabItem tabItem = items[j]; if (tabItem != null && !tabItem.isDisposed()) { - long /*int*/ parentHandle = tabItem.pageHandle; - long /*int*/ list = GTK.gtk_container_get_children (parentHandle); + long parentHandle = tabItem.pageHandle; + long list = GTK.gtk_container_get_children (parentHandle); if (list != 0) { - long /*int*/ handle = OS.g_list_data (list); + long handle = OS.g_list_data (list); if (handle != 0) { Widget widget = display.getWidget (handle); if (widget != null && widget != this) { @@ -414,7 +414,7 @@ Control[] _getChildren() { public TabItem getItem (int index) { checkWidget(); if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM); int itemCount = OS.g_list_length (list); OS.g_list_free (list); @@ -443,7 +443,7 @@ public TabItem getItem (int index) { public TabItem getItem(Point point) { checkWidget(); if (point == null) error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return null; int itemCount = OS.g_list_length (list); OS.g_list_free (list); @@ -467,7 +467,7 @@ public TabItem getItem(Point point) { */ public int getItemCount () { checkWidget(); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return 0; int itemCount = OS.g_list_length (list); OS.g_list_free (list); @@ -538,12 +538,12 @@ public int getSelectionIndex () { } @Override -long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { +long gtk_focus (long widget, long directionType) { return 0; } @Override -long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) { +long gtk_switch_page (long widget, long page, long page_num) { int index = GTK.gtk_notebook_get_current_page (handle); if (index != -1) { Control control = items [index].getControl (); @@ -591,7 +591,7 @@ void hookEvents () { public int indexOf (TabItem item) { checkWidget(); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return -1; int count = OS.g_list_length (list); OS.g_list_free (list); @@ -609,7 +609,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) { Control child = children [i]; int index = 0; int count = 0; - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list != 0) { count = OS.g_list_length (list); OS.g_list_free (list); @@ -639,7 +639,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) { boolean mnemonicHit (char key) { int itemCount = getItemCount (); for (int i=0; i= OS.VERSION(3, 14, 0)) { // Form background string String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "notebook header" : "GtkNotebook.header"; @@ -762,7 +762,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); TabItem [] items = getItems (); for (int i = 0; i < items.length; i++) { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java index 30bcca126e..1adc30a713 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java @@ -37,7 +37,7 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class TabItem extends Item { - long /*int*/ labelHandle, imageHandle, pageHandle, provider; + long labelHandle, imageHandle, pageHandle, provider; Control control; TabFolder parent; String toolTipText; @@ -221,13 +221,13 @@ public String getToolTipText () { } @Override -long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_enter_notify_event (long widget, long event) { parent.gtk_enter_notify_event (widget, event); return 0; } @Override -long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) { +long gtk_mnemonic_activate (long widget, long arg1) { return parent.gtk_mnemonic_activate (widget, arg1); } @@ -236,11 +236,11 @@ void hookEvents () { super.hookEvents (); if (labelHandle != 0) OS.g_signal_connect_closure_by_id (labelHandle, display.signalIds [MNEMONIC_ACTIVATE], 0, display.getClosure (MNEMONIC_ACTIVATE), false); if (GTK.GTK4) { - long /*int*/ motionController = GTK.gtk_event_controller_motion_new(); + long motionController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(handle, motionController); GTK.gtk_event_controller_set_propagation_phase(motionController, GTK.GTK_PHASE_TARGET); - long /*int*/ enterMotionAddress = display.enterMotionScrollCallback.getAddress(); + long enterMotionAddress = display.enterMotionScrollCallback.getAddress(); OS.g_signal_connect (motionController, OS.enter, enterMotionAddress, ENTER); } else { OS.g_signal_connect_closure_by_id (handle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.getClosure (ENTER_NOTIFY_EVENT), false); @@ -305,8 +305,8 @@ public void setControl (Control control) { if (control != null) { // To understand why we reparent, see implementation note about bug 454936 at the start of TabFolder. if (GTK.GTK4) { - long /*int*/ widget = control.topHandle(); - long /*int*/ parentContainer = GTK.gtk_widget_get_parent (widget); + long widget = control.topHandle(); + long parentContainer = GTK.gtk_widget_get_parent (widget); if (parentContainer != 0) { OS.g_object_ref (widget); //so that it won't get destroyed due to lack of references. GTK.gtk_container_remove (parentContainer, widget); @@ -345,6 +345,6 @@ public void setControl (Control control) { } -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { setFontDescription (labelHandle, font); setFontDescription (imageHandle, font); } @@ -355,14 +355,14 @@ void setForegroundRGBA (GdkRGBA rgba) { setForegroundGdkRGBA (imageHandle, rgba); } -void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setForegroundGdkRGBA (long handle, GdkRGBA rgba) { GdkRGBA toSet = new GdkRGBA(); if (rgba != null) { toSet = rgba; } else { toSet = display.COLOR_WIDGET_FOREGROUND_RGBA; } - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); // Form foreground string String color = display.gtk_rgba_to_css_string(toSet); String css = "* {color: " + color + ";}"; @@ -372,7 +372,7 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { gtk_css_provider_load_from_css(context, css); } -void gtk_css_provider_load_from_css (long /*int*/ context, String css) { +void gtk_css_provider_load_from_css (long context, String css) { /* Utility function. */ //@param css : a 'css java' string like "{\nbackground: red;\n}". if (provider == 0) { @@ -400,7 +400,7 @@ public void setImage (Image image) { } else { imageList.put (imageIndex, image); } - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + long pixbuf = imageList.getPixbuf (imageIndex); gtk_image_set_from_gicon (imageHandle, pixbuf); GTK.gtk_widget_show (imageHandle); } else { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java index 51d04a68f2..5dae096f76 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java @@ -73,10 +73,10 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class Table extends Composite { - long /*int*/ modelHandle, checkRenderer; + long modelHandle, checkRenderer; int itemCount, columnCount, lastIndexOf, sortDirection; int selectionCountOnPress,selectionCountOnRelease; - long /*int*/ ignoreCell; + long ignoreCell; TableItem [] items; TableColumn [] columns; TableItem currentItem; @@ -187,9 +187,9 @@ static int checkStyle (int style) { } @Override -long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) { +long cellDataProc (long tree_column, long cell, long tree_model, long iter, long data) { if (cell == ignoreCell) return 0; - long /*int*/ path = GTK.gtk_tree_model_get_path (tree_model, iter); + long path = GTK.gtk_tree_model_get_path (tree_model, iter); int [] index = new int [1]; C.memmove (index, GTK.gtk_tree_path_get_indices (path), 4); TableItem item = _getItem (index[0]); @@ -221,7 +221,7 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i setData = checkData (item); } } - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; if (setData) { ptr [0] = 0; if (isPixbuf) { @@ -338,7 +338,7 @@ public void addSelectionListener (SelectionListener listener) { addListener (SWT.DefaultSelection, typedListener); } -int calculateWidth (long /*int*/ column, long /*int*/ iter) { +int calculateWidth (long column, long iter) { GTK.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false); /* @@ -350,7 +350,7 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter) { //This workaround is causing the problem Bug 459834 in GTK3. So reverting the workaround for GTK3 int [] width = new int [1]; GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, width, null); - long /*int*/ textRenderer = getTextRenderer (column); + long textRenderer = getTextRenderer (column); int [] xpad = new int[1]; if (textRenderer != 0) GTK.gtk_cell_renderer_get_padding(textRenderer, xpad, null); return width [0] + xpad [0]*2; @@ -538,19 +538,19 @@ void createColumn (TableColumn column, int index) { modelIndex++; } if (modelIndex == modelLength) { - long /*int*/ oldModel = modelHandle; + long oldModel = modelHandle; long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time - long /*int*/ newModel = GTK.gtk_list_store_newv (types.length, types); + long newModel = GTK.gtk_list_store_newv (types.length, types); if (newModel == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int [] ptr1 = new int [1]; for (int i=0; i 0) { TableColumn checkColumn = columns [0]; @@ -626,7 +626,7 @@ void createHandle (int index) { gtk_widget_set_has_surface_or_window (fixedHandle, true); scrolledHandle = GTK.gtk_scrolled_window_new (0, 0); if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ [] types = getColumnTypes (1); + long [] types = getColumnTypes (1); modelHandle = GTK.gtk_list_store_newv (types.length, types); if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES); handle = GTK.gtk_tree_view_new_with_model (modelHandle); @@ -641,7 +641,7 @@ void createHandle (int index) { GTK.gtk_container_add (scrolledHandle, handle); int mode = (style & SWT.MULTI) != 0 ? GTK.GTK_SELECTION_MULTIPLE : GTK.GTK_SELECTION_BROWSE; - long /*int*/ selectionHandle = GTK.gtk_tree_view_get_selection (handle); + long selectionHandle = GTK.gtk_tree_view_get_selection (handle); GTK.gtk_tree_selection_set_mode (selectionHandle, mode); GTK.gtk_tree_view_set_headers_visible (handle, false); int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER; @@ -672,11 +672,11 @@ void createItem (TableColumn column, int index) { } else { createColumn (column, index); } - long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 3); + long boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 3); if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ labelHandle = GTK.gtk_label_new_with_mnemonic (null); + long labelHandle = GTK.gtk_label_new_with_mnemonic (null); if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ imageHandle = GTK.gtk_image_new (); + long imageHandle = GTK.gtk_image_new (); if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_container_add (boxHandle, imageHandle); GTK.gtk_container_add (boxHandle, labelHandle); @@ -757,7 +757,7 @@ void createItem (TableItem item, int index) { items [index] = item; } -void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) { +void createRenderers (long columnHandle, int modelIndex, boolean check, int columnStyle) { GTK.gtk_tree_view_column_clear (columnHandle); if ((style & SWT.CHECK) != 0 && check) { GTK.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false); @@ -770,7 +770,7 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN); } } - long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : GTK.gtk_cell_renderer_pixbuf_new (); + long pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : GTK.gtk_cell_renderer_pixbuf_new (); if (pixbufRenderer == 0) { error (SWT.ERROR_NO_HANDLES); } else { @@ -781,7 +781,7 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, GTK.gtk_cell_renderer_set_fixed_size(pixbufRenderer, 0, 0); } } - long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : GTK.gtk_cell_renderer_text_new (); + long textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : GTK.gtk_cell_renderer_text_new (); if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES); if (ownerDraw) { @@ -891,7 +891,7 @@ public void deselect (int index) { checkWidget(); if (index < 0 || index >= itemCount) return; boolean fixColumn = showFirstColumn (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); GTK.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle); OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); @@ -916,7 +916,7 @@ public void deselect (int index) { public void deselect (int start, int end) { checkWidget(); boolean fixColumn = showFirstColumn (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); for (int index=start; index<=end; index++) { if (index < 0 || index >= itemCount) continue; @@ -947,7 +947,7 @@ public void deselect (int [] indices) { checkWidget(); if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); boolean fixColumn = showFirstColumn (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); for (int i=0; i GTK.GTK_TREE_VIEW_GRID_LINES_NONE; } -long /*int*/ getPixbufRenderer (long /*int*/ column) { - long /*int*/ list = GTK.gtk_cell_layout_get_cells(column); +long getPixbufRenderer (long column) { + long list = GTK.gtk_cell_layout_get_cells(column); if (list == 0) return 0; - long /*int*/ originalList = list; - long /*int*/ pixbufRenderer = 0; + long originalList = list; + long pixbufRenderer = 0; while (list != 0) { - long /*int*/ renderer = OS.g_list_data (list); + long renderer = OS.g_list_data (list); if (GTK.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) { pixbufRenderer = renderer; break; @@ -1774,16 +1774,16 @@ long /*int*/ getPixbufRenderer (long /*int*/ column) { */ public TableItem [] getSelection () { checkWidget(); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); - long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, null); - long /*int*/ originalList = list; + long selection = GTK.gtk_tree_view_get_selection (handle); + long list = GTK.gtk_tree_selection_get_selected_rows (selection, null); + long originalList = list; if (list != 0) { int count = OS.g_list_length (list); int [] treeSelection = new int [count]; int length = 0; for (int i=0; i 0) { - long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + long columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); for (int i = 0; i < columnCount; i++) { if (columns [i].handle == columnHandle) { columnIndex = i; @@ -2902,8 +2902,8 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh } @Override -long /*int*/ rendererGetPreferredWidthProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ minimun_size, long /*int*/ natural_size) { - long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); +long rendererGetPreferredWidthProc (long cell, long handle, long minimun_size, long natural_size) { + long g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); GtkCellRendererClass klass = new GtkCellRendererClass (); OS.memmove (klass, g_class); OS.call (klass.get_preferred_width, cell, handle, minimun_size, natural_size); @@ -2912,35 +2912,35 @@ long /*int*/ rendererGetPreferredWidthProc (long /*int*/ cell, long /*int*/ hand } @Override -long /*int*/ rendererSnapshotProc (long /*int*/ cell, long /*int*/ snapshot, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { - long /*int*/ rect = Graphene.graphene_rect_alloc(); +long rendererSnapshotProc (long cell, long snapshot, long widget, long background_area, long cell_area, long flags) { + long rect = Graphene.graphene_rect_alloc(); GdkRectangle gdkRectangle = new GdkRectangle (); OS.memmove(gdkRectangle, background_area, GdkRectangle.sizeof); Graphene.graphene_rect_init(rect, gdkRectangle.x, gdkRectangle.y, gdkRectangle.width, gdkRectangle.height); - long /*int*/ cairo = GTK.gtk_snapshot_append_cairo(snapshot, rect); + long cairo = GTK.gtk_snapshot_append_cairo(snapshot, rect); rendererRender (cell, cairo, snapshot, widget, background_area, cell_area, 0, flags); return 0; } @Override -long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ cr, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { +long rendererRenderProc (long cell, long cr, long widget, long background_area, long cell_area, long flags) { rendererRender (cell, cr, 0, widget, background_area, cell_area, 0, flags); return 0; } -void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) { +void rendererRender (long cell, long cr, long snapshot, long widget, long background_area, long cell_area, long expose_area, long flags) { TableItem item = null; boolean wasSelected = false; - long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); + long iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); if (iter != 0) { - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); int [] buffer = new int [1]; C.memmove (buffer, GTK.gtk_tree_path_get_indices (path), 4); int index = buffer [0]; item = _getItem (index); GTK.gtk_tree_path_free (path); } - long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + long columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); int columnIndex = 0; if (columnCount > 0) { for (int i = 0; i < columnCount; i++) { @@ -2955,7 +2955,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, ( (GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell) || GTK.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) { drawFlags = (int)/*64*/flags; drawState = SWT.FOREGROUND; - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; GTK.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1); if (ptr [0] == 0) { int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex; @@ -2971,7 +2971,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, } GdkRectangle rect = new GdkRectangle (); - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); GTK.gtk_tree_view_get_background_area (handle, path, columnHandle, rect); GTK.gtk_tree_path_free (path); // A workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459117 @@ -2997,7 +2997,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, } //send out measure before erase - long /*int*/ textRenderer = getTextRenderer (columnHandle); + long textRenderer = getTextRenderer (columnHandle); if (textRenderer != 0) gtk_cell_renderer_get_preferred_size (textRenderer, handle, null, null); @@ -3055,7 +3055,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, if ((drawState & SWT.SELECTED) != 0) { Cairo.cairo_save (cr); Cairo.cairo_reset_clip (cr); - long /*int*/ context = GTK.gtk_widget_get_style_context (widget); + long context = GTK.gtk_widget_get_style_context (widget); GTK.gtk_style_context_save (context); GTK.gtk_style_context_add_class (context, GTK.GTK_STYLE_CLASS_CELL); GTK.gtk_style_context_set_state (context, GTK.GTK_STATE_FLAG_SELECTED); @@ -3081,7 +3081,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, gc.dispose (); } if ((drawState & SWT.FOREGROUND) != 0 || GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell)) { - long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); + long g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); GtkCellRendererClass klass = new GtkCellRendererClass (); OS.memmove (klass, g_class); if (drawForegroundRGBA != null && GTK.GTK_IS_CELL_RENDERER_TEXT (cell)) { @@ -3104,7 +3104,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, if (hooks (SWT.PaintItem)) { if (wasSelected) drawState |= SWT.SELECTED; GdkRectangle rect = new GdkRectangle (); - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); GTK.gtk_tree_view_get_background_area (handle, path, columnHandle, rect); GTK.gtk_tree_path_free (path); // A workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459117 @@ -3181,7 +3181,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, } } -private GC getGC(long /*int*/ cr) { +private GC getGC(long cr) { GC gc; GCData gcData = new GCData(); gcData.cairo = cr; @@ -3195,8 +3195,8 @@ void resetCustomDraw () { for (int i=0; i 1)) return; boolean fixColumn = showFirstColumn (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); for (int i=0; i= OS.VERSION(3, 10, 0)) { hasChildren = true; @@ -3766,7 +3766,7 @@ public void setRedraw (boolean redraw) { } } -void setScrollWidth (long /*int*/ column, TableItem item) { +void setScrollWidth (long column, TableItem item) { if (columnCount != 0 || currentItem == item) return; int width = GTK.gtk_tree_view_column_get_fixed_width (column); int itemWidth = calculateWidth (column, item.handle); @@ -4027,11 +4027,11 @@ public void setTopIndex (int index) { * Feature in GTK: cache the GtkAdjustment value for future use in * getTopIndex(). Set topIndex to index. */ - long /*int*/ vAdjustment; + long vAdjustment; vAdjustment = GTK.gtk_scrollable_get_vadjustment(handle); cachedAdjustment = GTK.gtk_adjustment_get_value(vAdjustment); topIndex = index; - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, _getItem (index).handle); + long path = GTK.gtk_tree_model_get_path (modelHandle, _getItem (index).handle); GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f); GTK.gtk_tree_path_free (path); } @@ -4070,10 +4070,10 @@ boolean showFirstColumn () { */ int columnCount = Math.max (1, this.columnCount); for (int i=0; i index || index > count - 1) return _getBackground (); - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1); if (ptr [0] == 0) return _getBackground (); @@ -160,7 +160,7 @@ boolean _getChecked () { } Color _getForeground () { - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; GTK.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1); if (ptr [0] == 0) return parent.getForeground (); GdkRGBA gdkRGBA = new GdkRGBA (); @@ -172,7 +172,7 @@ Color _getForeground () { Color _getForeground (int index) { int count = Math.max (1, parent.columnCount); if (0 > index || index > count - 1) return _getForeground (); - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1); if (ptr [0] == 0) return _getForeground (); @@ -185,7 +185,7 @@ Color _getForeground (int index) { Image _getImage (int index) { int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return null; - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1); if (ptr [0] == 0) return null; @@ -199,7 +199,7 @@ Image _getImage (int index) { String _getText (int index) { int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return ""; - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1); if (ptr [0] == 0) return ""; @@ -302,14 +302,14 @@ Rectangle getBoundsinPixels () { // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem checkWidget (); if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, 0); + long parentHandle = parent.handle; + long column = GTK.gtk_tree_view_get_column (parentHandle, 0); if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long pixbufRenderer = parent.getPixbufRenderer (column); if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; @@ -403,15 +403,15 @@ public Rectangle getBounds (int index) { Rectangle getBoundsInPixels (int index) { checkWidget(); if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (index >= 0 && index < parent.columnCount) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); GTK.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, false, false); GdkRectangle rect = new GdkRectangle (); @@ -597,18 +597,18 @@ public Rectangle getImageBounds (int index) { Rectangle getImageBoundsInPixels (int index) { checkWidget (); if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (index >= 0 && index < parent.columnCount) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long pixbufRenderer = parent.getPixbufRenderer (column); if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); GdkRectangle rect = new GdkRectangle (); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect); GTK.gtk_tree_path_free (path); @@ -632,7 +632,7 @@ Rectangle getImageBoundsInPixels (int index) { * position of the textRenderer, to ensure images/widgets/etc. aren't placed over the TableItem's * text. */ - long /*int*/ textRenderer = parent.getTextRenderer (column); + long textRenderer = parent.getTextRenderer (column); if (textRenderer == 0) return new Rectangle (0, 0, 0, 0); int [] xText = new int [1], wText = new int [1]; gtk_tree_view_column_cell_get_position (column, textRenderer, xText, wText); @@ -742,19 +742,19 @@ Rectangle getTextBoundsInPixels (int index) { if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0); // TODO fully test on early and later versions of GTK // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (index >= 0 && index < parent.columnCount) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long pixbufRenderer = parent.getPixbufRenderer (column); if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; @@ -906,16 +906,16 @@ public void setBackground (int index, Color color) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (parent.columnCount > 0) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return; - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long imageRenderer = parent.getPixbufRenderer (column); GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); } @@ -979,7 +979,7 @@ public void setFont (Font font){ if (oldFont == font) return; this.font = font; if (oldFont != null && oldFont.equals (font)) return; - long /*int*/ fontHandle = font != null ? font.handle : 0; + long fontHandle = font != null ? font.handle : 0; GTK.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1); cached = true; } @@ -1020,7 +1020,7 @@ public void setFont (int index, Font font) { if (oldFont != null && oldFont.equals (font)) return; int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; - long /*int*/ fontHandle = font != null ? font.handle : 0; + long fontHandle = font != null ? font.handle : 0; GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1); cached = true; @@ -1028,16 +1028,16 @@ public void setFont (int index, Font font) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (parent.columnCount > 0) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return; - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long imageRenderer = parent.getPixbufRenderer (column); GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); } @@ -1113,16 +1113,16 @@ public void setForeground (int index, Color color){ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (parent.columnCount > 0) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return; - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long imageRenderer = parent.getPixbufRenderer (column); GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); } @@ -1185,7 +1185,7 @@ public void setImage (int index, Image image) { } int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return; - long /*int*/ pixbuf = 0; + long pixbuf = 0; if (image != null) { ImageList imageList = parent.imageList; if (imageList == null) imageList = parent.imageList = new ImageList (); @@ -1210,15 +1210,15 @@ public void setImage (int index, Image image) { */ if ((!parent.ownerDraw) && (image != null) && (DPIUtil.getDeviceZoom() != 100)) { Rectangle imgSize = image.getBounds(); - long /*int*/ scaledPixbuf = GDK.gdk_pixbuf_scale_simple(pixbuf, imgSize.width, imgSize.height, GDK.GDK_INTERP_BILINEAR); + long scaledPixbuf = GDK.gdk_pixbuf_scale_simple(pixbuf, imgSize.width, imgSize.height, GDK.GDK_INTERP_BILINEAR); if (scaledPixbuf !=0) { pixbuf = scaledPixbuf; } } } long /*int*/parentHandle = parent.handle; - long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, index); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long column = GTK.gtk_tree_view_get_column (parentHandle, index); + long pixbufRenderer = parent.getPixbufRenderer (column); int [] currentWidth = new int [1]; int [] currentHeight= new int [1]; GTK.gtk_cell_renderer_get_fixed_size (pixbufRenderer, currentWidth, currentHeight); @@ -1356,7 +1356,7 @@ public void setText (int index, String string) { * Fix: when text or an image is set for a Table, compute its * width and see if it's larger than the maximum of the previous widths. */ - long /*int*/ column; + long column; if (parent.columnCount == 0) { column = GTK.gtk_tree_view_get_column (parent.handle, index); parent.maxWidth = Math.max(parent.maxWidth, parent.calculateWidth(column, this.handle)); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java index 9300825b6b..d3a2283d41 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java @@ -63,10 +63,10 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class Text extends Scrollable { - long /*int*/ bufferHandle; - long /*int*/ imContext; + long bufferHandle; + long imContext; int tabs = 8, lastEventTime = 0; - long /*int*/ gdkEventKey = 0; + long gdkEventKey = 0; int fixStart = -1, fixEnd = -1; boolean doubleClick; String message = ""; @@ -106,7 +106,7 @@ public class Text extends Scrollable { * a global variable to keep track of its background color. */ GdkRGBA background; - long /*int*/ indexMark = 0; + long indexMark = 0; double cachedAdjustment, currentAdjustment; /** @@ -230,7 +230,7 @@ void createHandle (int index) { if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { if ((style & SWT.BORDER) == 0) { GTK.gtk_entry_set_has_frame(handle, false); - long /*int*/ context = GTK.gtk_widget_get_style_context(handle); + long context = GTK.gtk_widget_get_style_context(handle); String background = display.gtk_rgba_to_css_string(display.COLOR_LIST_BACKGROUND_RGBA); gtk_css_provider_load_from_css(context, "entry {border: solid; background: " + background + ";}"); GTK.gtk_style_context_invalidate(context); @@ -447,7 +447,7 @@ public void append (String string) { GTK.gtk_text_buffer_get_end_iter (bufferHandle, position); GTK.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length); GTK.gtk_text_buffer_place_cursor (bufferHandle, position); - long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0); } applySegments (); @@ -489,7 +489,7 @@ void applySegments () { separator [0] = segmentsChars [i]; } byte [] buffer = Converter.wcsToMbcs (separator, false); - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); pos [0] = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, pos [0]); GTK.gtk_editable_insert_text (handle, buffer, buffer.length, pos); } @@ -503,7 +503,7 @@ void applySegments () { byte [] endIter = new byte [ITER_SIZEOF]; for (int i = 0; i < nSegments; i++) { GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, pos, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + i)); OS.g_free (ptr); if (segmentsChars != null && segmentsChars.length > i) { @@ -526,7 +526,7 @@ void clearSegments (boolean applyText) { OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); if (applyText) { OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT); - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); int start, end; for (int i = 0; i < nSegments; i++) { start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]); @@ -545,7 +545,7 @@ void clearSegments (boolean applyText) { byte [] startIter = new byte [ITER_SIZEOF], endIter = new byte [ITER_SIZEOF]; for (int i = 0; i < nSegments; i++) { GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i])); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, end, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1)); GTK.gtk_text_buffer_delete (bufferHandle, start, end); @@ -572,7 +572,7 @@ public void clearSelection () { GTK.gtk_editable_select_region (handle, position, position); } else { byte [] position = new byte [ITER_SIZEOF]; - long /*int*/ insertMark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long insertMark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, insertMark); GTK.gtk_text_buffer_select_range(bufferHandle, position, position); } @@ -586,13 +586,13 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { int[] w = new int [1], h = new int [1]; if ((style & SWT.SINGLE) != 0) { GTK.gtk_widget_realize (handle); - long /*int*/ layout = GTK.gtk_entry_get_layout (handle); + long layout = GTK.gtk_entry_get_layout (handle); OS.pango_layout_get_pixel_size (layout, w, h); } else { byte [] start = new byte [ITER_SIZEOF], end = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_bounds (bufferHandle, start, end); - long /*int*/ text = GTK.gtk_text_buffer_get_text (bufferHandle, start, end, true); - long /*int*/ layout = GTK.gtk_widget_create_pango_layout (handle, text); + long text = GTK.gtk_text_buffer_get_text (bufferHandle, start, end, true); + long layout = GTK.gtk_widget_create_pango_layout (handle, text); OS.g_free (text); OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE); OS.pango_layout_get_pixel_size (layout, w, h); @@ -602,7 +602,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { int height = h [0]; if ((style & SWT.SINGLE) != 0 && message.length () > 0) { byte [] buffer = Converter.wcsToMbcs (message, true); - long /*int*/ layout = GTK.gtk_widget_create_pango_layout (handle, buffer); + long layout = GTK.gtk_widget_create_pango_layout (handle, buffer); Arrays.fill (buffer, (byte) 0); OS.pango_layout_get_pixel_size (layout, w, h); OS.g_object_unref (layout); @@ -611,7 +611,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { if ((style & SWT.SEARCH) != 0) { // GtkSearchEntry have more padding than GtkEntry GtkBorder tmp = new GtkBorder(); - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); int state_flag = GTK.GTK_VERSION < OS.VERSION(3, 18, 0) ? GTK.GTK_STATE_FLAG_NORMAL : GTK.gtk_widget_get_state_flags(handle); gtk_style_context_get_padding(context, state_flag, tmp); width += tmp.left + tmp.right; @@ -631,7 +631,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) { int xborder = 0, yborder = 0; if ((style & SWT.SINGLE) != 0) { GtkBorder tmp = new GtkBorder(); - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); int state_flag = GTK.GTK_VERSION < OS.VERSION(3, 18, 0) ? GTK.GTK_STATE_FLAG_NORMAL : GTK.gtk_widget_get_state_flags(handle); gtk_style_context_get_padding(context, state_flag, tmp); trim.x -= tmp.left; @@ -699,7 +699,7 @@ public void copy () { if ((style & SWT.SINGLE) != 0) { GTK.gtk_editable_copy_clipboard (handle); } else { - long /*int*/ clipboard = GTK.gtk_clipboard_get (GDK.GDK_NONE); + long clipboard = GTK.gtk_clipboard_get (GDK.GDK_NONE); clearSegments (true); GTK.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard); applySegments (); @@ -723,7 +723,7 @@ public void cut () { if ((style & SWT.SINGLE) != 0) { GTK.gtk_editable_cut_clipboard (handle); } else { - long /*int*/ clipboard = GTK.gtk_clipboard_get (GDK.GDK_NONE); + long clipboard = GTK.gtk_clipboard_get (GDK.GDK_NONE); clearSegments (true); GTK.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, GTK.gtk_text_view_get_editable (handle)); applySegments (); @@ -768,7 +768,7 @@ GdkRGBA defaultBackground () { void deregister () { super.deregister (); if (bufferHandle != 0) display.removeWidget (bufferHandle); - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) display.removeWidget (imContext); } @@ -791,16 +791,16 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean } @Override -long /*int*/ eventWindow () { +long eventWindow () { return paintWindow (); } @Override -boolean filterKey (int keyval, long /*int*/ event) { +boolean filterKey (int keyval, long event) { int time = GDK.gdk_event_get_time (event); if (time != lastEventTime) { lastEventTime = time; - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { return GTK.gtk_im_context_filter_keypress (imContext, event); } @@ -819,7 +819,7 @@ void fixIM () { * filter has to be called by SWT. */ if (gdkEventKey != 0 && gdkEventKey != -1) { - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { GTK.gtk_im_context_filter_keypress (imContext, gdkEventKey); gdkEventKey = -1; @@ -856,7 +856,7 @@ public int getCaretLineNumber () { checkWidget (); if ((style & SWT.SINGLE) != 0) return 0; byte [] position = new byte [ITER_SIZEOF]; - long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark); return GTK.gtk_text_iter_get_line (position); } @@ -884,7 +884,7 @@ Point getCaretLocationInPixels () { index = GTK.gtk_entry_text_index_to_layout_index (handle, index); int [] offset_x = new int [1], offset_y = new int [1]; GTK.gtk_entry_get_layout_offsets (handle, offset_x, offset_y); - long /*int*/ layout = GTK.gtk_entry_get_layout (handle); + long layout = GTK.gtk_entry_get_layout (handle); PangoRectangle pos = new PangoRectangle (); OS.pango_layout_index_to_pos (layout, index, pos); int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidthInPixels (); @@ -892,7 +892,7 @@ Point getCaretLocationInPixels () { return new Point (x, y); } byte [] position = new byte [ITER_SIZEOF]; - long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark); GdkRectangle rect = new GdkRectangle (); GTK.gtk_text_view_get_iter_location (handle, position, rect); @@ -919,15 +919,15 @@ public int getCaretPosition () { checkWidget (); int result; if ((style & SWT.SINGLE) != 0) { - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_editable_get_position (handle)); } else { byte [] position = new byte [ITER_SIZEOF]; - long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark); byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true); result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (position)); OS.g_free (ptr); } @@ -948,13 +948,13 @@ public int getCharCount () { checkWidget (); int result; if ((style & SWT.SINGLE) != 0) { - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); result = (int)/*64*/OS.g_utf16_strlen (ptr, -1); } else { byte [] startIter = new byte [ITER_SIZEOF]; byte [] endIter = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); result = (int)/*64*/OS.g_utf16_strlen(ptr, -1); OS.g_free (ptr); } @@ -1120,16 +1120,16 @@ public int getOrientation () { if ((style & SWT.SINGLE) != 0) { int [] index = new int [1]; int [] trailing = new int [1]; - long /*int*/ layout = GTK.gtk_entry_get_layout (handle); + long layout = GTK.gtk_entry_get_layout (handle); OS.pango_layout_xy_to_index (layout, point.x * OS.PANGO_SCALE, point.y * OS.PANGO_SCALE, index, trailing); - long /*int*/ ptr = OS.pango_layout_get_text (layout); + long ptr = OS.pango_layout_get_text (layout); position = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; } else { byte [] p = new byte [ITER_SIZEOF]; GTK.gtk_text_view_get_iter_at_location (handle, p, point.x, point.y); byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, p, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, p, true); position = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (p)); OS.g_free (ptr); } @@ -1161,7 +1161,7 @@ public Point getSelection () { int [] start = new int [1]; int [] end = new int [1]; GTK.gtk_editable_get_selection_bounds (handle, start, end); - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); selection = new Point (start [0], end [0]); @@ -1171,7 +1171,7 @@ public Point getSelection () { GTK.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter); byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (startIter)); int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (endIter)); OS.g_free (ptr); @@ -1236,7 +1236,7 @@ public int getTabs () { int getTabWidth (int tabs) { byte[] buffer = Converter.wcsToMbcs(" ", true); - long /*int*/ layout = GTK.gtk_widget_create_pango_layout (handle, buffer); + long layout = GTK.gtk_widget_create_pango_layout (handle, buffer); int [] width = new int [1]; int [] height = new int [1]; OS.pango_layout_get_size (layout, width, height); @@ -1323,7 +1323,7 @@ public String getText (int start, int end) { */ public char [] getTextChars () { checkWidget (); - long /*int*/ address; + long address; if ((style & SWT.SINGLE) != 0) { address = GTK.gtk_entry_get_text (handle); } else { @@ -1400,7 +1400,7 @@ public int getTopIndex () { * one to see if the user has scrolled/moved the viewport using the GUI. * If so, we use the old method of fetching the top index. */ - long /*int*/ vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle); + long vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle); currentAdjustment = GTK.gtk_adjustment_get_value (vAdjustment); if (cachedAdjustment == currentAdjustment) { // If indexMark is 0, fetch topIndex using the old method @@ -1452,14 +1452,14 @@ int getTopPixelInPixels () { } @Override -long /*int*/ gtk_activate (long /*int*/ widget) { +long gtk_activate (long widget) { sendSelectionEvent (SWT.DefaultSelection); return 0; } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { - long /*int*/ result; +long gtk_button_press_event (long widget, long event) { + long result; result = super.gtk_button_press_event (widget, event); if (result != 0) return result; int eventType = GDK.gdk_event_get_event_type(event); @@ -1474,7 +1474,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_changed (long /*int*/ widget) { +long gtk_changed (long widget) { /* * Feature in GTK. When the user types, GTK positions * the caret after sending the changed signal. This @@ -1483,7 +1483,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) { * is to post the modify event when the user is typing. */ boolean keyPress = false; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int eventType = GDK.gdk_event_get_event_type(eventPtr); eventType = fixGdkEventTypeValues(eventType); @@ -1510,7 +1510,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) { } @Override -long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) { +long gtk_commit (long imContext, long text) { if (text == 0) return 0; if ((style & SWT.SINGLE) != 0) { if (!GTK.gtk_editable_get_editable (handle)) return 0; @@ -1555,7 +1555,7 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) { } @Override -long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*int*/ iter2) { +long gtk_delete_range (long widget, long iter1, long iter2) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; byte [] startIter = new byte [ITER_SIZEOF]; byte [] endIter = new byte [ITER_SIZEOF]; @@ -1565,7 +1565,7 @@ long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*i int end = GTK.gtk_text_iter_get_offset (endIter); byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start); end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end); OS.g_free (ptr); @@ -1599,9 +1599,9 @@ long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*i } @Override -long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) { +long gtk_delete_text (long widget, long start_pos, long end_pos) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); @@ -1633,7 +1633,7 @@ long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { +long gtk_event_after (long widget, long gdkEvent) { if (cursor != null) setCursor (cursor.handle); /* * Feature in GTK. The gtk-entry-select-on-focus property is a global @@ -1655,7 +1655,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { focusIn[0] = gdkEventFocus.in != 0; } if (focusIn[0]) { - long /*int*/ settings = GTK.gtk_settings_get_default (); + long settings = GTK.gtk_settings_get_default (); OS.g_object_set (settings, GTK.gtk_entry_select_on_focus, true, 0); } break; @@ -1665,9 +1665,9 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if ((state & OBSCURED) != 0) return 0; - long /*int*/ result = super.gtk_draw (widget, cairo); + long result = super.gtk_draw (widget, cairo); return result; } @@ -1678,14 +1678,14 @@ boolean mustBeVisibleOnInitBounds() { } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { fixIM (); return super.gtk_focus_out_event (widget, event); } @Override -long /*int*/ gtk_grab_focus (long /*int*/ widget) { - long /*int*/ result = super.gtk_grab_focus (widget); +long gtk_grab_focus (long widget) { + long result = super.gtk_grab_focus (widget); /* * Feature in GTK. GtkEntry widgets select their text on focus in, * clearing the previous selection. This behavior is controlled by @@ -1694,14 +1694,14 @@ long /*int*/ gtk_grab_focus (long /*int*/ widget) { * the entry has done focus in processing. */ if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) { - long /*int*/ settings = GTK.gtk_settings_get_default (); + long settings = GTK.gtk_settings_get_default (); OS.g_object_set (settings, GTK.gtk_entry_select_on_focus, false, 0); } return result; } @Override -long /*int*/ gtk_icon_release (long /*int*/ widget, long /*int*/ icon_pos, long /*int*/ event) { +long gtk_icon_release (long widget, long icon_pos, long event) { Event e = new Event(); if (icon_pos == GTK.GTK_ENTRY_ICON_PRIMARY) { e.detail = SWT.ICON_SEARCH; @@ -1713,7 +1713,7 @@ long /*int*/ gtk_icon_release (long /*int*/ widget, long /*int*/ icon_pos, long } @Override -long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) { +long gtk_insert_text (long widget, long new_text, long new_text_length, long position) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text == 0 || new_text_length == 0) return 0; byte [] buffer = new byte [(int)/*64*/new_text_length]; @@ -1721,7 +1721,7 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long / String oldText = new String (Converter.mbcsToWcs (buffer)); int [] pos = new int [1]; C.memmove (pos, position, 4); - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); /* Use the selection when the text was deleted */ int start = pos [0], end = pos [0]; @@ -1762,14 +1762,14 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long / } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_press_event (long widget, long event) { boolean handleSegments = false, segmentsCleared = false; if (hooks (SWT.Segments) || filters (SWT.Segments)) { int length; int [] state = new int[1]; GDK.gdk_event_get_state(event, state); if (GTK.GTK4) { - long /*int*/ [] eventString = new long /*int*/ [1]; + long [] eventString = new long [1]; GDK.gdk_event_get_string(event, eventString); length = (int)/*64*/OS.g_utf16_strlen (eventString[0], -1); } else { @@ -1785,7 +1785,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { } } } - long /*int*/ result = super.gtk_key_press_event (widget, event); + long result = super.gtk_key_press_event (widget, event); if (result != 0) fixIM (); if (gdkEventKey == -1) result = 1; gdkEventKey = 0; @@ -1796,7 +1796,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { +long gtk_populate_popup (long widget, long menu) { if ((style & SWT.RIGHT_TO_LEFT) != 0) { GTK.gtk_widget_set_direction (menu, GTK.GTK_TEXT_DIR_RTL); GTK.gtk_container_forall (menu, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL); @@ -1805,7 +1805,7 @@ long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { } @Override -long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter, long /*int*/ text, long /*int*/ length) { +long gtk_text_buffer_insert_text (long widget, long iter, long text, long length) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; byte [] position = new byte [ITER_SIZEOF]; C.memmove (position, iter, position.length); @@ -1818,7 +1818,7 @@ long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter } byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true); start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start); end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end); OS.g_free(ptr); @@ -1859,7 +1859,7 @@ void hookEvents () { OS.g_signal_connect_closure (bufferHandle, OS.delete_range, display.getClosure (DELETE_RANGE), false); OS.g_signal_connect_closure (handle, OS.populate_popup, display.getClosure (POPULATE_POPUP), false); } - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { OS.g_signal_connect_closure (imContext, OS.commit, display.getClosure (COMMIT), false); int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ()); @@ -1881,7 +1881,7 @@ void hookEvents () { OS.g_signal_connect_closure (handle, OS.direction_changed, display.getClosure (DIRECTION_CHANGED), true); } -long /*int*/ imContext () { +long imContext () { if (imContext != 0) return imContext; return 0; } @@ -1910,9 +1910,9 @@ private boolean insideBlockSelection (int x, int y) { if ((style & SWT.SINGLE) != 0) { int [] index = new int [1]; int [] trailing = new int [1]; - long /*int*/ layout = GTK.gtk_entry_get_layout (handle); + long layout = GTK.gtk_entry_get_layout (handle); OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing); - long /*int*/ ptr = OS.pango_layout_get_text (layout); + long ptr = OS.pango_layout_get_text (layout); position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; } else { byte [] p = new byte [ITER_SIZEOF]; @@ -2008,7 +2008,7 @@ private void scrollIfNotVisible(byte [] iter, byte [] scrollTo, boolean insert) // If it is not in the visible area, scroll to the insertion/selection point if (distanceTopIndex >= numLinesVisible) { if (insert) { - long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0); } else if (scrollTo != null) { GTK.gtk_text_view_scroll_to_iter (handle, scrollTo, 0, true, 0, 0); @@ -2022,7 +2022,7 @@ private void scrollIfNotVisible(byte [] iter, byte [] scrollTo, boolean insert) if (scrollTo != null && !insert) { GTK.gtk_text_view_scroll_to_iter (handle, scrollTo, 0, true, 0, 0); } else if (insert) { - long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0); } } @@ -2030,10 +2030,10 @@ private void scrollIfNotVisible(byte [] iter, byte [] scrollTo, boolean insert) } @Override -long /*int*/ paintWindow () { +long paintWindow () { if ((style & SWT.SINGLE) != 0) { - long /*int*/ window = super.paintWindow (); - long /*int*/ children = GDK.gdk_window_get_children (window); + long window = super.paintWindow (); + long children = GDK.gdk_window_get_children (window); if (children != 0) { /* * When search or cancel icons are added to Text, those @@ -2054,10 +2054,10 @@ long /*int*/ paintWindow () { } @Override -long /*int*/ paintSurface () { +long paintSurface () { if ((style & SWT.SINGLE) != 0) { - long /*int*/ surface = super.paintSurface (); - long /*int*/ children = GDK.gdk_surface_get_children (surface); + long surface = super.paintSurface (); + long children = GDK.gdk_surface_get_children (surface); if (children != 0) { /* * When search or cancel icons are added to Text, those @@ -2092,7 +2092,7 @@ public void paste () { if ((style & SWT.SINGLE) != 0) { GTK.gtk_editable_paste_clipboard (handle); } else { - long /*int*/ clipboard = GTK.gtk_clipboard_get (GDK.GDK_NONE); + long clipboard = GTK.gtk_clipboard_get (GDK.GDK_NONE); clearSegments (true); GTK.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, GTK.gtk_text_view_get_editable (handle)); applySegments (); @@ -2103,7 +2103,7 @@ public void paste () { void register () { super.register (); if (bufferHandle != 0) display.addWidget (bufferHandle, this); - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) display.addWidget (imContext, this); } @@ -2258,7 +2258,7 @@ GdkRGBA getContextColorGdkRGBA () { } @Override -void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundGdkRGBA (long context, long handle, GdkRGBA rgba) { /* Setting the background color overrides the selected background color. * To prevent this, we need to re-set the default. This can be done with CSS * on GTK3.16+, or by using GtkStateFlags as an argument to @@ -2308,8 +2308,8 @@ void setForegroundGdkRGBA (GdkRGBA rgba) { } @Override -void setCursor (long /*int*/ cursor) { - long /*int*/ defaultCursor = 0; +void setCursor (long cursor) { + long defaultCursor = 0; if (cursor == 0) { if (GTK.GTK4) { byte [] name = Converter.wcsToMbcs("text", true); @@ -2396,7 +2396,7 @@ public void setEditable (boolean editable) { } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); setTabStops (tabs); } @@ -2481,14 +2481,14 @@ public void setSelection (int start) { checkWidget (); start = translateOffset (start); if ((style & SWT.SINGLE) != 0) { - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); GTK.gtk_editable_set_position (handle, start); } else { byte [] startIter = new byte [ITER_SIZEOF]; byte [] endIter = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); OS.g_free (ptr); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start); @@ -2527,7 +2527,7 @@ public void setSelection (int start, int end) { start = translateOffset (start); end = translateOffset (end); if ((style & SWT.SINGLE) != 0) { - long /*int*/ ptr = GTK.gtk_entry_get_text (handle); + long ptr = GTK.gtk_entry_get_text (handle); start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); GTK.gtk_editable_set_position (handle, start); @@ -2536,7 +2536,7 @@ public void setSelection (int start, int end) { byte [] startIter = new byte [ITER_SIZEOF]; byte [] endIter = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); - long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); OS.g_free (ptr); @@ -2605,7 +2605,7 @@ public void setTabs (int tabs) { void setTabStops (int tabs) { int tabWidth = getTabWidth (tabs); - long /*int*/ tabArray = OS.pango_tab_array_new (1, false); + long tabArray = OS.pango_tab_array_new (1, false); OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth); if ((style & SWT.SINGLE) != 0) { GTK.gtk_entry_set_tabs (handle, tabArray); @@ -2717,7 +2717,7 @@ void setText (char [] text) { OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0); GTK.gtk_text_buffer_place_cursor (bufferHandle, position); - long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle); + long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0); Arrays.fill (buffer, (byte) 0); } @@ -2788,7 +2788,7 @@ public void setTopIndex (int index) { byte [] buffer = Converter.wcsToMbcs ("index_mark", true); indexMark = GTK.gtk_text_buffer_create_mark (bufferHandle, buffer, position, true); GTK.gtk_text_view_scroll_to_mark (handle, indexMark, 0, true, 0, 0); - long /*int*/ vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle); + long vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle); cachedAdjustment = GTK.gtk_adjustment_get_value (vAdjustment); } @@ -2808,7 +2808,7 @@ public void setTopIndex (int index) { public void showSelection () { checkWidget (); if ((style & SWT.SINGLE) != 0) return; - long /*int*/ mark = GTK.gtk_text_buffer_get_selection_bound (bufferHandle); + long mark = GTK.gtk_text_buffer_get_selection_bound (bufferHandle); GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0); mark = GTK.gtk_text_buffer_get_insert (bufferHandle); GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0); @@ -2823,15 +2823,15 @@ int translateOffset (int offset) { } @Override -boolean translateTraversal (long /*int*/ event) { +boolean translateTraversal (long event) { int [] key = new int[1]; GDK.gdk_event_get_keyval(event, key); switch (key[0]) { case GDK.GDK_KP_Enter: case GDK.GDK_Return: { - long /*int*/ imContext = imContext (); + long imContext = imContext (); if (imContext != 0) { - long /*int*/ [] preeditString = new long /*int*/ [1]; + long [] preeditString = new long [1]; GTK.gtk_im_context_get_preedit_string (imContext, preeditString, null, null); if (preeditString [0] != 0) { int length = C.strlen (preeditString [0]); @@ -2845,7 +2845,7 @@ boolean translateTraversal (long /*int*/ event) { } @Override -int traversalCode (int key, long /*int*/ event) { +int traversalCode (int key, long event) { int bits = super.traversalCode (key, event); if ((style & SWT.READ_ONLY) != 0) return bits; if ((style & SWT.MULTI) != 0) { @@ -2876,7 +2876,7 @@ String verifyText (String string, int start, int end) { event.text = string; event.start = start; event.end = end; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int type = GDK.gdk_event_get_event_type(eventPtr); type = fixGdkEventTypeValues(type); @@ -2899,7 +2899,7 @@ String verifyText (String string, int start, int end) { } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { +long windowProc (long handle, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case BACKSPACE: @@ -2922,7 +2922,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case DIRECTION_CHANGED: { @@ -2936,7 +2936,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case DELETE_FROM_CURSOR: { @@ -2953,7 +2953,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ ar } @Override -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long arg2, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case MOVE_CURSOR: { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java index b32cb235fa..7376a23cc5 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java @@ -220,12 +220,12 @@ Widget [] computeTabList () { } @Override -long /*int*/ eventHandle () { +long eventHandle () { return fixedHandle; } @Override -long /*int*/ enterExitHandle() { +long enterExitHandle() { return handle; } @@ -245,10 +245,10 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De } @Override -boolean forceFocus (long /*int*/ focusHandle) { +boolean forceFocus (long focusHandle) { int dir = GTK.GTK_DIR_TAB_FORWARD; if ((style & SWT.MIRRORED) != 0) dir = GTK.GTK_DIR_TAB_BACKWARD; - long /*int*/ childHandle = handle; + long childHandle = handle; if (currentFocusItem != null) childHandle = currentFocusItem.handle; /* * Feature in GTK. GtkToolBar takes care of navigating through @@ -322,7 +322,7 @@ ToolItem getItemInPixels (Point point) { */ public int getItemCount () { checkWidget(); - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return 0; int itemCount = OS.g_list_length (list); OS.g_list_free (list); @@ -351,14 +351,14 @@ public ToolItem [] getItems () { } ToolItem [] _getItems () { - long /*int*/ list = GTK.gtk_container_get_children (handle); + long list = GTK.gtk_container_get_children (handle); if (list == 0) return new ToolItem [0]; int count = OS.g_list_length (list); ToolItem [] items = new ToolItem [count]; - long /*int*/ originalList = list; + long originalList = list; int index = 0; for (int i=0; i= OS.VERSION(3, 14, 0)) { // Form background string String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "toolbar" : "GtkToolbar"; @@ -614,7 +614,7 @@ void setParentBackground () { } @Override -void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setForegroundGdkRGBA (long handle, GdkRGBA rgba) { if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { GdkRGBA toSet = new GdkRGBA(); if (rgba != null) { @@ -622,7 +622,7 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { } else { toSet = display.COLOR_WIDGET_FOREGROUND_RGBA; } - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); // Form foreground string String color = display.gtk_rgba_to_css_string(toSet); String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle) @@ -644,7 +644,7 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) { } @Override -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { super.setFontDescription (font); ToolItem [] items = getItems (); for (int i = 0; i < items.length; i++) { @@ -659,7 +659,7 @@ void restoreBackground () { * setting the foreground color from overriding the background color * (or replacing it with black). */ - long /*int*/ context = GTK.gtk_widget_get_style_context(handle); + long context = GTK.gtk_widget_get_style_context(handle); String finalCss = display.gtk_css_create_css_color_string (this.cssBackground, this.cssForeground, SWT.BACKGROUND); gtk_css_provider_load_from_css (context, finalCss); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java index 4b01dfc69a..4223d39f02 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java @@ -41,8 +41,8 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class ToolItem extends Item { - long /*int*/ arrowHandle, labelHandle, imageHandle; - long /*int*/ eventHandle, proxyMenuItem, provider; + long arrowHandle, labelHandle, imageHandle; + long eventHandle, proxyMenuItem, provider; ToolBar parent; Control control; Image hotImage, disabledImage; @@ -207,8 +207,8 @@ void createHandle (int index) { * disabled when it does not contain menu. The fix is to * find the arrow button handle and enable it. */ - long /*int*/ child = GTK.gtk_bin_get_child (handle); - long /*int*/ list = GTK.gtk_container_get_children (child); + long child = GTK.gtk_bin_get_child (handle); + long list = GTK.gtk_container_get_children (child); arrowHandle = OS.g_list_nth_data (list, 1); if (arrowHandle != 0) { GTK.gtk_widget_set_sensitive (arrowHandle, true); @@ -303,7 +303,7 @@ public Rectangle getBounds () { Rectangle getBoundsInPixels () { checkWidget(); parent.forceResize (); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation (topHandle, allocation); int x = allocation.x; @@ -367,7 +367,7 @@ public Image getDisabledImage () { */ public boolean getEnabled () { checkWidget(); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); return GTK.gtk_widget_get_sensitive (topHandle); } @@ -462,14 +462,14 @@ public int getWidth () { int getWidthInPixels () { checkWidget(); parent.forceResize (); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); GtkAllocation allocation = new GtkAllocation(); GTK.gtk_widget_get_allocation (topHandle, allocation); return allocation.width; } @Override -long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { +long gtk_event (long widget, long event) { if (!GTK.GTK4) return 0; int eventType = GDK.gdk_event_get_event_type(event); switch (eventType) { @@ -484,24 +484,24 @@ long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { return parent.gtk_button_press_event (widget, event); } @Override -long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_release_event (long widget, long event) { return parent.gtk_button_release_event (widget, event); } @Override -long /*int*/ gtk_clicked (long /*int*/ widget) { +long gtk_clicked (long widget) { Event event = new Event (); if ((style & SWT.DROP_DOWN) != 0) { - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int eventType = GDK.gdk_event_get_event_type(eventPtr); eventType = Control.fixGdkEventTypeValues(eventType); - long /*int*/ topHandle = topHandle(); + long topHandle = topHandle(); switch (eventType) { case GDK.GDK_KEY_RELEASE: //Fall Through.. case GDK.GDK_BUTTON_PRESS: @@ -543,7 +543,7 @@ long /*int*/ gtk_clicked (long /*int*/ widget) { } @Override -long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) { +long gtk_create_menu_proxy (long widget) { /* * Feature in GTK. If the item is a radio/check button * with only image, then that image does not appear in @@ -567,7 +567,7 @@ long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) { if (imageList != null) { int index = imageList.indexOf (image); if (index != -1) { - long /*int*/ pixbuf = imageList.getPixbuf (index); + long pixbuf = imageList.getPixbuf (index); byte[] label = null; int [] showImages = new int []{1}; /* @@ -588,13 +588,13 @@ long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) { else { label = Converter.wcsToMbcs(text, true); } - long /*int*/ menuItem = GTK.gtk_menu_item_new (); + long menuItem = GTK.gtk_menu_item_new (); if (menuItem == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 6); + long boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 6); if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ menuLabel = GTK.gtk_accel_label_new (label); + long menuLabel = GTK.gtk_accel_label_new (label); if (menuLabel == 0) error (SWT.ERROR_NO_HANDLES); if (GTK.GTK_VERSION >= OS.VERSION (3, 16, 0)) { GTK.gtk_label_set_xalign (labelHandle, 0); @@ -603,7 +603,7 @@ long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) { GTK.gtk_misc_set_alignment(labelHandle, 0, 0); } - long /*int*/ menuImage = GTK.gtk_image_new_from_pixbuf (pixbuf); + long menuImage = GTK.gtk_image_new_from_pixbuf (pixbuf); if (menuImage == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_container_add (boxHandle, menuImage); @@ -625,7 +625,7 @@ long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) { return 0; } -void gtk_css_provider_load_from_css (long /*int*/ context, String css) { +void gtk_css_provider_load_from_css (long context, String css) { /* Utility function. */ //@param css : a 'css java' string like "{\nbackground: red;\n}". if (provider == 0) { @@ -641,7 +641,7 @@ void gtk_css_provider_load_from_css (long /*int*/ context, String css) { } @Override -long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_enter_notify_event (long widget, long event) { parent.gtk_enter_notify_event (widget, event); drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null; if (drawHotImage) { @@ -649,7 +649,7 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { if (imageList != null) { int index = imageList.indexOf (hotImage); if (index != -1 && imageHandle != 0) { - long /*int*/ pixbuf = imageList.getPixbuf (index); + long pixbuf = imageList.getPixbuf (index); gtk_image_set_from_gicon(imageHandle, pixbuf); } } @@ -658,7 +658,7 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { +long gtk_event_after (long widget, long gdkEvent) { int eventType = GDK.gdk_event_get_event_type(gdkEvent); eventType = Control.fixGdkEventTypeValues(eventType); switch (eventType) { @@ -678,20 +678,20 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { } @Override -long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_in_event (long widget, long event) { parent.hasChildFocus = true; parent.currentFocusItem = this; return 0; } @Override -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { parent.hasChildFocus = false; return 0; } @Override -long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_leave_notify_event (long widget, long event) { parent.gtk_leave_notify_event (widget, event); if (drawHotImage) { drawHotImage = false; @@ -700,7 +700,7 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { if (imageList != null) { int index = imageList.indexOf (image); if (index != -1 && imageHandle != 0) { - long /*int*/ pixbuf = imageList.getPixbuf (index); + long pixbuf = imageList.getPixbuf (index); gtk_image_set_from_gicon(imageHandle, pixbuf); } } @@ -710,13 +710,13 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_map (long /*int*/ widget) { +long gtk_map (long widget) { parent.fixZOrder (); return 0; } @Override -long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) { +long gtk_mnemonic_activate (long widget, long arg1) { return parent.gtk_mnemonic_activate (widget, arg1); } @@ -732,26 +732,26 @@ void hookEvents () { */ eventHandle = GTK.gtk_bin_get_child(handle); if ((style & SWT.DROP_DOWN) != 0) { - long /*int*/ list = GTK.gtk_container_get_children(eventHandle); + long list = GTK.gtk_container_get_children(eventHandle); eventHandle = OS.g_list_nth_data(list, 0); if (arrowHandle != 0) OS.g_signal_connect_closure (arrowHandle, OS.clicked, display.getClosure (CLICKED), false); } OS.g_signal_connect_closure (handle, OS.create_menu_proxy, display.getClosure (CREATE_MENU_PROXY), false); if (GTK.GTK4) { - long /*int*/ keyController = GTK.gtk_event_controller_key_new(); + long keyController = GTK.gtk_event_controller_key_new(); GTK.gtk_widget_add_controller(eventHandle, keyController); GTK.gtk_event_controller_set_propagation_phase(keyController, GTK.GTK_PHASE_TARGET); - long /*int*/ focusAddress = display.focusCallback.getAddress(); + long focusAddress = display.focusCallback.getAddress(); OS.g_signal_connect (keyController, OS.focus_in, focusAddress, FOCUS_IN); OS.g_signal_connect (keyController, OS.focus_out, focusAddress, FOCUS_OUT); - long /*int*/ motionController = GTK.gtk_event_controller_motion_new(); + long motionController = GTK.gtk_event_controller_motion_new(); GTK.gtk_widget_add_controller(eventHandle, motionController); GTK.gtk_event_controller_set_propagation_phase(motionController, GTK.GTK_PHASE_TARGET); - long /*int*/ enterAddress = display.enterMotionScrollCallback.getAddress(); - long /*int*/ leaveAddress = display.leaveCallback.getAddress(); + long enterAddress = display.enterMotionScrollCallback.getAddress(); + long leaveAddress = display.leaveCallback.getAddress(); OS.g_signal_connect (motionController, OS.enter, enterAddress, ENTER); OS.g_signal_connect (motionController, OS.leave, leaveAddress, LEAVE); } else { @@ -788,7 +788,7 @@ void hookEvents () { } OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.getClosure (EVENT_AFTER), false); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.getClosure (MAP), true); } @@ -989,7 +989,7 @@ public void setDisabledImage (Image image) { */ public void setEnabled (boolean enabled) { checkWidget(); - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); if (GTK.gtk_widget_get_sensitive (topHandle) == enabled) return; GTK.gtk_widget_set_sensitive (topHandle, enabled); } @@ -998,7 +998,7 @@ boolean setFocus () { return GTK.gtk_widget_child_focus (handle, GTK.GTK_DIR_TAB_FORWARD); } -void setFontDescription (long /*int*/ font) { +void setFontDescription (long font) { if (labelHandle != 0) setFontDescription (labelHandle, font); } @@ -1010,10 +1010,10 @@ void setBackgroundRGBA (GdkRGBA rgba) { if (handle != 0) setBackgroundRGBA (handle, rgba); } -void setBackgroundRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setBackgroundRGBA (long handle, GdkRGBA rgba) { if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) { // Form background string - long /*int*/ context = GTK.gtk_widget_get_style_context(handle); + long context = GTK.gtk_widget_get_style_context(handle); String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle) : display.gtk_widget_get_name(handle); String css = name + " {background-color: " + display.gtk_rgba_to_css_string(rgba) + "}"; @@ -1024,12 +1024,12 @@ void setBackgroundRGBA (long /*int*/ handle, GdkRGBA rgba) { } } -void setForegroundRGBA (long /*int*/ handle, GdkRGBA rgba) { +void setForegroundRGBA (long handle, GdkRGBA rgba) { if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) { GdkRGBA selectedForeground = display.COLOR_LIST_SELECTION_TEXT_RGBA; GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_NORMAL, rgba); GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_SELECTED, selectedForeground); - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); GTK.gtk_style_context_invalidate (context); return; } @@ -1039,7 +1039,7 @@ void setForegroundRGBA (long /*int*/ handle, GdkRGBA rgba) { } else { toSet = display.COLOR_WIDGET_FOREGROUND_RGBA; } - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); // Form foreground string String color = display.gtk_rgba_to_css_string(toSet); String css = "* {color: " + color + ";}"; @@ -1100,7 +1100,7 @@ public void setImage (Image image) { } else { imageList.put (imageIndex, image); } - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + long pixbuf = imageList.getPixbuf (imageIndex); gtk_image_set_from_gicon(imageHandle, pixbuf); } else { gtk_image_set_from_gicon(imageHandle, 0); @@ -1262,9 +1262,9 @@ public void setToolTipText (String string) { } void setToolTipText (Shell shell, String newString) { - long /*int*/ child = GTK.gtk_bin_get_child (handle); + long child = GTK.gtk_bin_get_child (handle); if ((style & SWT.DROP_DOWN) != 0) { - long /*int*/ list = GTK.gtk_container_get_children (child); + long list = GTK.gtk_container_get_children (child); child = OS.g_list_nth_data (list, 0); if (arrowHandle != 0) shell.setToolTipText (arrowHandle, newString); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java index a89d321610..9aae4dcd43 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java @@ -49,8 +49,8 @@ public class ToolTip extends Widget { String text, message; TrayItem item; int x, y, timerId; - long /*int*/ layoutText = 0, layoutMessage = 0; - long /*int*/ provider; + long layoutText = 0, layoutMessage = 0; + long provider; int [] borderPolygon; boolean spikeAbove, autohide; @@ -149,12 +149,12 @@ void configure () { int monitorNumber; GdkRectangle dest = new GdkRectangle (); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); + long display = GDK.gdk_display_get_default(); multipleMonitors = GDK.gdk_display_get_n_monitors(display) > 1; - long /*int*/ monitor = GDK.gdk_display_get_monitor_at_point(display, point.x, point.y); + long monitor = GDK.gdk_display_get_monitor_at_point(display, point.x, point.y); GDK.gdk_monitor_get_geometry (monitor, dest); } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); multipleMonitors = GDK.gdk_screen_get_n_monitors(screen) > 1; monitorNumber = GDK.gdk_screen_get_monitor_at_point(screen, point.x, point.y); GDK.gdk_screen_get_monitor_geometry(screen, monitorNumber, dest); @@ -283,7 +283,7 @@ void createHandle (int index) { state |= HANDLE; handle = GTK.gtk_window_new (GTK.GTK_WINDOW_POPUP); Color background = display.getSystemColor (SWT.COLOR_INFO_BACKGROUND); - long /*int*/ context = GTK.gtk_widget_get_style_context (handle); + long context = GTK.gtk_widget_get_style_context (handle); GdkRGBA bgRGBA = background.handle; String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "window" : "GtkWindow"; String css = name + " {background-color: " + display.gtk_rgba_to_css_string(bgRGBA) + ";}"; @@ -293,7 +293,7 @@ void createHandle (int index) { } } -void gtk_css_provider_load_from_css (long /*int*/ context, String css) { +void gtk_css_provider_load_from_css (long context, String css) { /* Utility function. */ //@param css : a 'css java' string like "{\nbackground: red;\n}". if (provider == 0) { @@ -319,7 +319,7 @@ void createWidget (int index) { @Override void destroyWidget () { - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); if (parent != null) parent.removeTooTip (this); releaseHandle (); if (topHandle != 0 && (state & HANDLE) != 0) { @@ -352,7 +352,7 @@ Point getLocation () { int x = this.x; int y = this.y; if (item != null) { - long /*int*/ itemHandle = item.handle; + long itemHandle = item.handle; GdkRectangle area = new GdkRectangle (); GTK.gtk_status_icon_get_geometry (itemHandle, 0, area, 0); x = area.x + area.width / 2; @@ -484,7 +484,7 @@ public boolean getVisible () { } @Override -long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { +long gtk_event (long widget, long event) { if (!GTK.GTK4) return 0; int eventType = GDK.gdk_event_get_event_type(event); switch (eventType) { @@ -499,21 +499,21 @@ long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { sendSelectionEvent (SWT.Selection, null, true); setVisible (false); return 0; } -void drawTooltip (long /*int*/ cr) { - long /*int*/ gdkResource = GTK.GTK4 ? gtk_widget_get_surface(handle) : gtk_widget_get_window (handle); +void drawTooltip (long cr) { + long gdkResource = GTK.GTK4 ? gtk_widget_get_surface(handle) : gtk_widget_get_window (handle); int x = BORDER + PADDING; int y = BORDER + PADDING; - long /*int*/ cairo = 0; - long /*int*/ context = 0; + long cairo = 0; + long context = 0; if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { if (cr == 0) { - long /*int*/ cairo_region = GDK.gdk_window_get_visible_region(gdkResource); + long cairo_region = GDK.gdk_window_get_visible_region(gdkResource); context = GDK.gdk_window_begin_draw_frame(gdkResource, cairo_region); cairo = GDK.gdk_drawing_context_get_cairo_context(context); } else { @@ -529,7 +529,7 @@ void drawTooltip (long /*int*/ cairo) { case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs ("dialog-warning", true); break; } if (buffer != null) { - long /*int*/ pixbuf = GTK.gtk_icon_theme_load_icon(GTK.gtk_icon_theme_get_default(), buffer, GTK.GTK_ICON_SIZE_MENU, 0, 0); + long pixbuf = GTK.gtk_icon_theme_load_icon(GTK.gtk_icon_theme_get_default(), buffer, GTK.GTK_ICON_SIZE_MENU, 0, 0); GDK.gdk_cairo_set_source_pixbuf(cairo, pixbuf, x, y); Cairo.cairo_paint (cairo); OS.g_object_unref (pixbuf); @@ -554,25 +554,25 @@ void drawTooltip (long /*int*/ cairo) { } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { if ((state & OBSCURED) != 0) return 0; drawTooltip (cairo); return 0; } @Override -long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { +long gtk_size_allocate (long widget, long allocation) { Point point = getLocation (); int x = point.x; int y = point.y; GTK.gtk_widget_realize (widget); GdkRectangle dest = new GdkRectangle (); if (GTK.GTK_VERSION >= OS.VERSION(3, 22, 0)) { - long /*int*/ display = GDK.gdk_display_get_default(); - long /*int*/ monitor = GDK.gdk_display_get_monitor_at_point(display, x, y); + long display = GDK.gdk_display_get_default(); + long monitor = GDK.gdk_display_get_monitor_at_point(display, x, y); GDK.gdk_monitor_get_geometry(monitor, dest); } else { - long /*int*/ screen = GDK.gdk_screen_get_default (); + long screen = GDK.gdk_screen_get_default (); int monitorNumber = GDK.gdk_screen_get_monitor_at_point(screen, point.x, point.y); GDK.gdk_screen_get_monitor_geometry (screen, monitorNumber, dest); } @@ -795,13 +795,13 @@ public void setText (String string) { byte [] buffer = Converter.wcsToMbcs (text, true); layoutText = GTK.gtk_widget_create_pango_layout (handle, buffer); OS.pango_layout_set_auto_dir (layoutText, false); - long /*int*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD); + long boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD); PangoAttribute attribute = new PangoAttribute (); OS.memmove (attribute, boldAttr, PangoAttribute.sizeof); attribute.start_index = 0; attribute.end_index = buffer.length; OS.memmove (boldAttr, attribute, PangoAttribute.sizeof); - long /*int*/ attrList = OS.pango_attr_list_new (); + long attrList = OS.pango_attr_list_new (); OS.pango_attr_list_insert (attrList, boldAttr); OS.pango_layout_set_attributes (layoutText, attrList); OS.pango_attr_list_unref (attrList); @@ -835,7 +835,7 @@ public void setVisible (boolean visible) { configure (); GTK.gtk_widget_show (handle); } else { - long /*int*/ vboxHandle = parent.vboxHandle; + long vboxHandle = parent.vboxHandle; StringBuilder string = new StringBuilder (text); if (text.length () > 0) string.append ("\n\n"); string.append (message); @@ -847,7 +847,7 @@ public void setVisible (boolean visible) { if ((style & SWT.BALLOON) != 0) { GTK.gtk_widget_hide (handle); } else { - long /*int*/ vboxHandle = parent.vboxHandle; + long vboxHandle = parent.vboxHandle; byte[] buffer = Converter.wcsToMbcs("", true); GTK.gtk_widget_set_tooltip_text(vboxHandle, buffer); } @@ -855,7 +855,7 @@ public void setVisible (boolean visible) { } @Override -long /*int*/ timerProc (long /*int*/ widget) { +long timerProc (long widget) { if ((style & SWT.BALLOON) != 0) { GTK.gtk_widget_hide (handle); } diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java index 19f819d96b..1a6f659f8c 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java @@ -47,14 +47,14 @@ import org.eclipse.swt.internal.gtk.*; public class Tracker extends Widget { Composite parent; Cursor cursor; - long /*int*/ lastCursor, window, overlay; - long /*int*/ surface; + long lastCursor, window, overlay; + long surface; boolean tracking, cancelled, grabbed, stippled; Rectangle [] rectangles = new Rectangle [0], proportions = rectangles; Rectangle bounds; int cursorOrientation = SWT.NONE; int oldX, oldY; - long /*int*/ provider; // Gtk3.14 + long provider; // Gtk3.14 // Re-use/cache some items for performance reasons as draw-events must be efficient to prevent jitter. Rectangle cachedCombinedDisplayResolution = Display.getDefault().getBounds(); // Cached for performance reasons. @@ -329,14 +329,14 @@ Rectangle [] computeProportions (Rectangle [] rects) { * @param rects */ void drawRectangles (Rectangle [] rects) { - long /*int*/ gdkResource = 0; + long gdkResource = 0; if (GTK.GTK4) { if (parent != null) gdkResource = gtk_widget_get_surface(parent.handle); } else { gdkResource = GDK.gdk_get_default_root_window(); } if (parent != null) { - long /*int*/ paintHandle = parent.paintHandle(); + long paintHandle = parent.paintHandle(); gdkResource = GTK.GTK4 ? gtk_widget_get_surface(paintHandle) : gtk_widget_get_window (paintHandle); } if (gdkResource == 0) return; @@ -374,7 +374,7 @@ void drawRectangles (Rectangle [] rects) { } } - long /*int*/ region = Cairo.cairo_region_create (); + long region = Cairo.cairo_region_create (); cairo_rectangle_int_t rect = new cairo_rectangle_int_t(); if (isOnScreen) { // Combine Rects into a region. (region is not necessarily a rectangle, E.g it can be 'L' shaped etc..). @@ -411,11 +411,11 @@ void drawRectangles (Rectangle [] rects) { GTK.gtk_widget_shape_combine_region (overlay, region); Cairo.cairo_region_destroy (region); if (GTK.GTK4) { - long /*int*/ overlaySurface = GTK.gtk_widget_get_surface (overlay); + long overlaySurface = GTK.gtk_widget_get_surface (overlay); GDK.gdk_surface_hide (overlaySurface); GDK.gdk_surface_show (overlaySurface); } else { - long /*int*/ overlayWindow = GTK.gtk_widget_get_window (overlay); + long overlayWindow = GTK.gtk_widget_get_window (overlay); GDK.gdk_window_hide (overlayWindow); GDK.gdk_window_show (overlayWindow); } @@ -469,21 +469,21 @@ public boolean getStippled () { } boolean grab () { - long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0; + long cursor = this.cursor != null ? this.cursor.handle : 0; int result = gdk_pointer_grab (GTK.GTK4 ? surface : window, GDK.GDK_OWNERSHIP_NONE, false, GDK.GDK_POINTER_MOTION_MASK | GDK.GDK_BUTTON_RELEASE_MASK, 0, cursor, GDK.GDK_CURRENT_TIME); return result == GDK.GDK_GRAB_SUCCESS; } @Override -long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_release_event (long widget, long event) { Control.mouseDown = false; return gtk_mouse (GTK.GTK4 ? GDK.GDK4_BUTTON_RELEASE : GDK.GDK_BUTTON_RELEASE, widget, event); } @Override -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_key_press_event (widget, eventPtr); +long gtk_key_press_event (long widget, long eventPtr) { + long result = super.gtk_key_press_event (widget, eventPtr); if (result != 0) return result; int [] state = new int[1]; GDK.gdk_event_get_state(eventPtr, state); @@ -618,8 +618,8 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { } @Override -long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0; +long gtk_motion_notify_event (long widget, long eventPtr) { + long cursor = this.cursor != null ? this.cursor.handle : 0; if (cursor != lastCursor) { ungrab (); grabbed = grab (); @@ -628,7 +628,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr return gtk_mouse (GTK.GTK4 ? GDK.GDK4_MOTION_NOTIFY : GDK.GDK_MOTION_NOTIFY, widget, eventPtr); } -long /*int*/ gtk_mouse (int eventType, long /*int*/ widget, long /*int*/ eventPtr) { +long gtk_mouse (int eventType, long widget, long eventPtr) { int [] newX = new int [1], newY = new int [1]; if (GTK.GTK4) { display.gdk_surface_get_device_position (surface, newX, newY, null); @@ -824,7 +824,7 @@ public boolean open () { GTK.gtk_window_set_title (overlay, new byte [1]); if (parent != null) GTK.gtk_window_set_transient_for(overlay, parent.topHandle()); GTK.gtk_widget_realize (overlay); - long /*int*/ overlayWindow = GTK.gtk_widget_get_window (overlay); + long overlayWindow = GTK.gtk_widget_get_window (overlay); GDK.gdk_window_set_override_redirect (overlayWindow, true); setTrackerBackground(true); Rectangle bounds = display.getBoundsInPixels(); @@ -888,7 +888,7 @@ private void setTrackerBackground(boolean opaque) { + "border-right-color: transparent;" + "border-bottom-color: transparent;}"; } - long /*int*/ context = GTK.gtk_widget_get_style_context (overlay); + long context = GTK.gtk_widget_get_style_context (overlay); if (provider == 0) { provider = GTK.gtk_css_provider_new (); GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -901,16 +901,16 @@ private void setTrackerBackground(boolean opaque) { } GTK.gtk_style_context_invalidate (context); } - long /*int*/ region = Cairo.cairo_region_create (); + long region = Cairo.cairo_region_create (); GTK.gtk_widget_shape_combine_region (overlay, region); GTK.gtk_widget_input_shape_combine_region (overlay, region); Cairo.cairo_region_destroy (region); } -boolean processEvent (long /*int*/ eventPtr) { +boolean processEvent (long eventPtr) { int eventType = GDK.gdk_event_get_event_type(eventPtr); eventType = Control.fixGdkEventTypeValues(eventType); - long /*int*/ widget = GTK.gtk_get_event_widget (eventPtr); + long widget = GTK.gtk_get_event_widget (eventPtr); switch (eventType) { case GDK.GDK_MOTION_NOTIFY: gtk_motion_notify_event (widget, eventPtr); break; case GDK.GDK_BUTTON_RELEASE: gtk_button_release_event (widget, eventPtr); break; diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java index 7c80a35e2b..90557f847b 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java @@ -42,8 +42,8 @@ public class TrayItem extends Item { Tray parent; ToolTip toolTip; String toolTipText; - long /*int*/ imageHandle; - long /*int*/ tooltipsHandle; + long imageHandle; + long tooltipsHandle; ImageList imageList; Image highlightImage; @@ -245,7 +245,7 @@ public String getToolTipText () { } @Override -long /*int*/ gtk_activate (long /*int*/ widget) { +long gtk_activate (long widget) { sendSelectionEvent (SWT.Selection); /* * Feature in GTK. GTK will generate a single-click event before sending @@ -253,10 +253,10 @@ long /*int*/ gtk_activate (long /*int*/ widget) { * the single-click as the current event and for the double-click in the * event queue. */ - long /*int*/ nextEvent = GDK.gdk_event_peek (); + long nextEvent = GDK.gdk_event_peek (); if (nextEvent != 0) { int nextEventType = GDK.GDK_EVENT_TYPE (nextEvent); - long /*int*/ currEvent = GTK.gtk_get_current_event (); + long currEvent = GTK.gtk_get_current_event (); int currEventType = 0; if (currEvent != 0) { currEventType = GDK.GDK_EVENT_TYPE (currEvent); @@ -273,7 +273,7 @@ long /*int*/ gtk_activate (long /*int*/ widget) { } @Override -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { int eventType = GDK.gdk_event_get_event_type(event); eventType = Control.fixGdkEventTypeValues(eventType); int [] eventButton = new int [1]; @@ -292,10 +292,10 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { } @Override -long /*int*/ gtk_gesture_press_event (long /*int*/ gesture, int n_press, double x, double y, long /*int*/ event) { +long gtk_gesture_press_event (long gesture, int n_press, double x, double y, long event) { if (n_press == 1) return 0; - long /*int*/ widget = GTK.gtk_event_controller_get_widget(gesture); - long /*int*/ result = gtk_button_press_event (widget, event); + long widget = GTK.gtk_event_controller_get_widget(gesture); + long result = gtk_button_press_event (widget, event); if (n_press == 2) { sendSelectionEvent (SWT.DefaultSelection); @@ -305,12 +305,12 @@ long /*int*/ gtk_gesture_press_event (long /*int*/ gesture, int n_press, double } @Override -long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { +long gtk_size_allocate (long widget, long allocation) { return 0; } @Override -long /*int*/ gtk_status_icon_popup_menu (long /*int*/ widget, long /*int*/ button, long /*int*/ activate_time) { +long gtk_status_icon_popup_menu (long widget, long button, long activate_time) { /* * GTK provides a MenuPositionFunc for GtkStatusIcon in order * to set the popup-menu aligned to the tray. @@ -471,7 +471,7 @@ public void setImage (Image image) { } else { imageList.put (imageIndex, image); } - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + long pixbuf = imageList.getPixbuf (imageIndex); GTK.gtk_status_icon_set_from_pixbuf (handle, pixbuf); GTK.gtk_status_icon_set_visible (handle, true); } else { diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java index 24ff1555a6..76a1d5810d 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java @@ -79,10 +79,10 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public class Tree extends Composite { - long /*int*/ modelHandle, checkRenderer; + long modelHandle, checkRenderer; int columnCount, sortDirection; int selectionCountOnPress,selectionCountOnRelease; - long /*int*/ ignoreCell; + long ignoreCell; TreeItem[] items; TreeColumn [] columns; TreeColumn sortColumn; @@ -169,14 +169,14 @@ void _addListener (int eventType, Listener listener) { } } -TreeItem _getItem (long /*int*/ iter) { +TreeItem _getItem (long iter) { int id = getId (iter, true); if (items [id] != null) return items [id]; - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); int depth = GTK.gtk_tree_path_get_depth (path); int [] indices = new int [depth]; C.memmove (indices, GTK.gtk_tree_path_get_indices (path), 4*depth); - long /*int*/ parentIter = 0; + long parentIter = 0; if (depth > 1) { GTK.gtk_tree_path_up (path); parentIter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); @@ -188,8 +188,8 @@ TreeItem _getItem (long /*int*/ iter) { return items [id]; } -TreeItem _getItem (long /*int*/ parentIter, int index) { - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); +TreeItem _getItem (long parentIter, int index) { + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); GTK.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index); int id = getId (iter, true); OS.g_free (iter); @@ -197,7 +197,7 @@ TreeItem _getItem (long /*int*/ parentIter, int index) { return items [id] = new TreeItem (this, parentIter, SWT.NONE, index, false); } -int getId (long /*int*/ iter, boolean queryModel) { +int getId (long iter, boolean queryModel) { if (queryModel) { int[] value = new int[1]; GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1); @@ -234,7 +234,7 @@ static int checkStyle (int style) { } @Override -long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) { +long cellDataProc (long tree_column, long cell, long tree_model, long iter, long data) { if (cell == ignoreCell) return 0; TreeItem item = _getItem (iter); if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle); @@ -269,7 +269,7 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i item.updated = false; } } - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; if (setData) { if (isPixbuf) { ptr [0] = 0; @@ -415,7 +415,7 @@ public void addTreeListener(TreeListener listener) { addListener (SWT.Collapse, typedListener); } -int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) { +int calculateWidth (long column, long iter, boolean recurse) { GTK.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false); /* * Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size() @@ -429,7 +429,7 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) { int width = 0; int [] w = new int [1]; - long /*int*/ path = 0; + long path = 0; /* * gtk_tree_view_get_expander_column() returns 0 if the expander column is not visible. @@ -437,7 +437,7 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) { * the width for the expander column. The fix is to always get the expander column as if * it is visible. */ - long /*int*/ expander_column = GTK.gtk_tree_view_get_expander_column(handle); + long expander_column = GTK.gtk_tree_view_get_expander_column(handle); if (expander_column == 0 && !GTK.gtk_tree_view_column_get_visible(column)) { GTK.gtk_tree_view_column_set_visible(column, true); expander_column = GTK.gtk_tree_view_get_expander_column(handle); @@ -471,11 +471,11 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) { } if (!GTK.GTK4) GTK.gtk_widget_style_get(handle, OS.focus_line_width, w, 0); width += 2 * w [0]; - long /*int*/ list = GTK.gtk_cell_layout_get_cells(column); + long list = GTK.gtk_cell_layout_get_cells(column); if (list == 0) return 0; - long /*int*/ temp = list; + long temp = list; while (temp != 0) { - long /*int*/ renderer = OS.g_list_data (temp); + long renderer = OS.g_list_data (temp); if (renderer != 0) { gtk_cell_renderer_get_preferred_size (renderer, handle, w, null); width += w [0]; @@ -488,7 +488,7 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) { if (path == 0) path = GTK.gtk_tree_model_get_path (modelHandle, iter); boolean expanded = GTK.gtk_tree_view_row_expanded (handle, path); if (expanded) { - long /*int*/ childIter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long childIter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); boolean valid = GTK.gtk_tree_model_iter_children (modelHandle, childIter, iter); while (valid) { width = Math.max (width, calculateWidth (column, childIter, true)); @@ -539,8 +539,8 @@ public void clear(int index, boolean all) { clear (0, index, all); } -void clear (long /*int*/ parentIter, int index, boolean all) { - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); +void clear (long parentIter, int index, boolean all) { + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); GTK.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index); int[] value = new int[1]; GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1); @@ -575,10 +575,10 @@ public void clearAll (boolean all) { checkWidget (); clearAll (all, 0); } -void clearAll (boolean all, long /*int*/ parentIter) { +void clearAll (boolean all, long parentIter) { int length = GTK.gtk_tree_model_iter_n_children (modelHandle, parentIter); if (length == 0) return; - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); boolean valid = GTK.gtk_tree_model_iter_children (modelHandle, iter, parentIter); int[] value = new int[1]; while (valid) { @@ -626,15 +626,15 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { return size; } -void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int newStart, long /*int*/ [] types, long /*int*/ oldParent, long /*int*/ newParent, int modelLength) { - long /*int*/ iter = OS.g_malloc(GTK.GtkTreeIter_sizeof ()); +void copyModel (long oldModel, int oldStart, long newModel, int newStart, long [] types, long oldParent, long newParent, int modelLength) { + long iter = OS.g_malloc(GTK.GtkTreeIter_sizeof ()); if (GTK.gtk_tree_model_iter_children (oldModel, iter, oldParent)) { - long /*int*/ [] oldItems = new long /*int*/ [GTK.gtk_tree_model_iter_n_children (oldModel, oldParent)]; + long [] oldItems = new long [GTK.gtk_tree_model_iter_n_children (oldModel, oldParent)]; int oldIndex = 0; - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int [] ptr1 = new int [1]; do { - long /*int*/ newItem = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long newItem = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); if (newItem == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_tree_store_append (newModel, newItem, newParent); GTK.gtk_tree_model_get (oldModel, iter, ID_COLUMN, ptr1, -1); @@ -643,7 +643,7 @@ void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int if (index != -1) { item = items [index]; if (item != null) { - long /*int*/ oldItem = item.handle; + long oldItem = item.handle; oldItems[oldIndex++] = oldItem; /* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */ for (int j = 0; j < FOREGROUND_COLUMN; j++) { @@ -697,7 +697,7 @@ void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int } } while (GTK.gtk_tree_model_iter_next(oldModel, iter)); for (int i = 0; i < oldItems.length; i++) { - long /*int*/ oldItem = oldItems [i]; + long oldItem = oldItems [i]; if (oldItem != 0) { GTK.gtk_tree_store_remove (oldModel, oldItem); OS.g_free (oldItem); @@ -730,16 +730,16 @@ void createColumn (TreeColumn column, int index) { modelIndex++; } if (modelIndex == modelLength) { - long /*int*/ oldModel = modelHandle; + long oldModel = modelHandle; long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time - long /*int*/ newModel = GTK.gtk_tree_store_newv (types.length, types); + long newModel = GTK.gtk_tree_store_newv (types.length, types); if (newModel == 0) error (SWT.ERROR_NO_HANDLES); copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, modelLength); GTK.gtk_tree_view_set_model (handle, newModel); setModel (newModel); } } - long /*int*/ columnHandle = GTK.gtk_tree_view_column_new (); + long columnHandle = GTK.gtk_tree_view_column_new (); if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES); if (index == 0 && columnCount > 0) { TreeColumn checkColumn = columns [0]; @@ -782,7 +782,7 @@ void createHandle (int index) { gtk_widget_set_has_surface_or_window (fixedHandle, true); scrolledHandle = GTK.gtk_scrolled_window_new (0, 0); if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ [] types = getColumnTypes (1); + long [] types = getColumnTypes (1); modelHandle = GTK.gtk_tree_store_newv (types.length, types); if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES); handle = GTK.gtk_tree_view_new_with_model (modelHandle); @@ -797,7 +797,7 @@ void createHandle (int index) { GTK.gtk_container_add (scrolledHandle, handle); int mode = (style & SWT.MULTI) != 0 ? GTK.GTK_SELECTION_MULTIPLE : GTK.GTK_SELECTION_BROWSE; - long /*int*/ selectionHandle = GTK.gtk_tree_view_get_selection (handle); + long selectionHandle = GTK.gtk_tree_view_get_selection (handle); GTK.gtk_tree_selection_set_mode (selectionHandle, mode); GTK.gtk_tree_view_set_headers_visible (handle, false); int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER; @@ -838,11 +838,11 @@ void createItem (TreeColumn column, int index) { } else { createColumn (column, index); } - long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 3); + long boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 3); if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ labelHandle = GTK.gtk_label_new_with_mnemonic (null); + long labelHandle = GTK.gtk_label_new_with_mnemonic (null); if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ imageHandle = GTK.gtk_image_new (); + long imageHandle = GTK.gtk_image_new (); if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_container_add (boxHandle, imageHandle); GTK.gtk_container_add (boxHandle, labelHandle); @@ -888,7 +888,7 @@ void createItem (TreeColumn column, int index) { } } -void createItem (TreeItem item, long /*int*/ parentIter, int index) { +void createItem (TreeItem item, long parentIter, int index) { int count = GTK.gtk_tree_model_iter_n_children (modelHandle, parentIter); if (index == -1) index = count; if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); @@ -908,7 +908,7 @@ void createItem (TreeItem item, long /*int*/ parentIter, int index) { modelChanged = true; } -void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) { +void createRenderers (long columnHandle, int modelIndex, boolean check, int columnStyle) { GTK.gtk_tree_view_column_clear (columnHandle); if ((style & SWT.CHECK) != 0 && check) { GTK.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false); @@ -920,7 +920,7 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle); } } - long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : GTK.gtk_cell_renderer_pixbuf_new (); + long pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : GTK.gtk_cell_renderer_pixbuf_new (); if (pixbufRenderer == 0) { error (SWT.ERROR_NO_HANDLES); } else { @@ -943,7 +943,7 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, } } } - long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : GTK.gtk_cell_renderer_text_new (); + long textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : GTK.gtk_cell_renderer_text_new (); if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES); if (ownerDraw) { @@ -1055,7 +1055,7 @@ public void deselect (TreeItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); boolean fixColumn = showFirstColumn (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); GTK.gtk_tree_selection_unselect_iter (selection, item.handle); OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); @@ -1073,7 +1073,7 @@ public void deselect (TreeItem item) { public void deselectAll() { checkWidget(); boolean fixColumn = showFirstColumn (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); GTK.gtk_tree_selection_unselect_all (selection); OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); @@ -1087,7 +1087,7 @@ void destroyItem (TreeColumn column) { index++; } if (index == columnCount) return; - long /*int*/ columnHandle = column.handle; + long columnHandle = column.handle; if (columnCount == 1) { firstCustomDraw = column.customDraw; } @@ -1095,9 +1095,9 @@ void destroyItem (TreeColumn column) { columns [columnCount] = null; GTK.gtk_tree_view_remove_column (handle, columnHandle); if (columnCount == 0) { - long /*int*/ oldModel = modelHandle; + long oldModel = modelHandle; long /*int*/[] types = getColumnTypes (1); - long /*int*/ newModel = GTK.gtk_tree_store_newv (types.length, types); + long newModel = GTK.gtk_tree_store_newv (types.length, types); if (newModel == 0) error (SWT.ERROR_NO_HANDLES); copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, FIRST_COLUMN + CELL_TYPES); GTK.gtk_tree_view_set_model (handle, newModel); @@ -1107,7 +1107,7 @@ void destroyItem (TreeColumn column) { for (int i=0; i (rect.y + rect.height)) { - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, parent, itemCount - 1); itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, iter); - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect); expanded = GTK.gtk_tree_view_row_expanded (handle, path); GTK.gtk_tree_path_free (path); @@ -2361,7 +2361,7 @@ void drawInheritedBackground (long /*int*/ cairo) { } @Override -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { boolean haveBoundsChanged = boundsChangedSinceLastDraw; boundsChangedSinceLastDraw = false; if ((state & OBSCURED) != 0) return 0; @@ -2383,19 +2383,19 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { } @Override -long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_motion_notify_event (long widget, long event) { if (GTK.GTK4) { - long /*int*/ surface = GDK.gdk_event_get_surface(event); + long surface = GDK.gdk_event_get_surface(event); if (surface != gtk_widget_get_surface(handle)) return 0; } else { - long /*int*/ window = GDK.GDK_EVENT_WINDOW (event); + long window = GDK.GDK_EVENT_WINDOW (event); if (window != GTK.gtk_tree_view_get_bin_window (handle)) return 0; } return super.gtk_motion_notify_event (widget, event); } @Override -long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) { +long gtk_row_deleted (long model, long path) { if (ignoreAccessibility) { OS.g_signal_stop_emission_by_name (model, OS.row_deleted); } @@ -2403,7 +2403,7 @@ long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) { } @Override -long /*int*/ gtk_row_has_child_toggled (long /*int*/ model, long /*int*/ path, long /*int*/ iter) { +long gtk_row_has_child_toggled (long model, long path, long iter) { /* * Feature in GTK. The expanded state of a row that lost * its children is not persisted by GTK. So, the row @@ -2427,7 +2427,7 @@ long /*int*/ gtk_row_has_child_toggled (long /*int*/ model, long /*int*/ path, l } @Override -long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) { +long gtk_row_inserted (long model, long path, long iter) { if (ignoreAccessibility) { OS.g_signal_stop_emission_by_name (model, OS.row_inserted); } @@ -2435,14 +2435,14 @@ long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int } @Override -long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) { - long /*int*/ result = super.gtk_scroll_event(widget, eventPtr); +long gtk_scroll_event (long widget, long eventPtr) { + long result = super.gtk_scroll_event(widget, eventPtr); if (!wasScrolled) wasScrolled = true; return result; } @Override -long /*int*/ gtk_start_interactive_search(long /*int*/ widget) { +long gtk_start_interactive_search(long widget) { if (!searchEnabled()) { OS.g_signal_stop_emission_by_name(widget, OS.start_interactive_search); return 1; @@ -2451,7 +2451,7 @@ long /*int*/ gtk_start_interactive_search(long /*int*/ widget) { } @Override -long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) { +long gtk_test_collapse_row (long tree, long iter, long path) { int [] index = new int [1]; GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1); TreeItem item = items [index [0]]; @@ -2491,7 +2491,7 @@ long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long / } @Override -long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) { +long gtk_test_expand_row (long tree, long iter, long path) { int [] index = new int [1]; GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1); TreeItem item = items [index [0]]; @@ -2535,11 +2535,11 @@ long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*i } @Override -long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) { - long /*int*/ path = GTK.gtk_tree_path_new_from_string (pathStr); +long gtk_toggled (long renderer, long pathStr) { + long path = GTK.gtk_tree_path_new_from_string (pathStr); if (path == 0) return 0; TreeItem item = null; - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof()); if (GTK.gtk_tree_model_get_iter (modelHandle, iter, path)) { item = _getItem (iter); } @@ -2556,7 +2556,7 @@ long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) { } @Override -void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisition) { +void gtk_widget_get_preferred_size (long widget, GtkRequisition requisition) { /* * Bug in GTK. For some reason, gtk_widget_size_request() fails * to include the height of the tree view items when there are @@ -2567,17 +2567,17 @@ void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisit super.gtk_widget_get_preferred_size (widget, requisition); return; } - long /*int*/ columns = GTK.gtk_tree_view_get_columns (handle), list = columns; + long columns = GTK.gtk_tree_view_get_columns (handle), list = columns; boolean fixVisible = columns != 0; while (list != 0) { - long /*int*/ column = OS.g_list_data (list); + long column = OS.g_list_data (list); if (GTK.gtk_tree_view_column_get_visible (column)) { fixVisible = false; break; } list = OS.g_list_next (list); } - long /*int*/ columnHandle = 0; + long columnHandle = 0; if (fixVisible) { columnHandle = OS.g_list_data (columns); GTK.gtk_tree_view_column_set_visible (columnHandle, true); @@ -2590,14 +2590,14 @@ void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisit } void hideFirstColumn () { - long /*int*/ firstColumn = GTK.gtk_tree_view_get_column (handle, 0); + long firstColumn = GTK.gtk_tree_view_get_column (handle, 0); GTK.gtk_tree_view_column_set_visible (firstColumn, false); } @Override void hookEvents () { super.hookEvents (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection(handle); + long selection = GTK.gtk_tree_view_get_selection(handle); OS.g_signal_connect_closure (selection, OS.changed, display.getClosure (CHANGED), false); OS.g_signal_connect_closure (handle, OS.row_activated, display.getClosure (ROW_ACTIVATED), false); OS.g_signal_connect_closure (handle, OS.test_expand_row, display.getClosure (TEST_EXPAND_ROW), false); @@ -2667,10 +2667,10 @@ public int indexOf (TreeItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); int index = -1; - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle); + long path = GTK.gtk_tree_model_get_path (modelHandle, item.handle); int depth = GTK.gtk_tree_path_get_depth (path); if (depth == 1) { - long /*int*/ indices = GTK.gtk_tree_path_get_indices (path); + long indices = GTK.gtk_tree_path_get_indices (path); if (indices != 0) { int[] temp = new int[1]; C.memmove (temp, indices, 4); @@ -2684,7 +2684,7 @@ public int indexOf (TreeItem item) { @Override boolean mnemonicHit (char key) { for (int i=0; i end) return; int itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, parentIter); if (!(0 <= start && start <= end && end < itemCount)) { error (SWT.ERROR_INVALID_RANGE); } - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long selection = GTK.gtk_tree_view_get_selection (handle); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); if (iter == 0) error (SWT.ERROR_NO_HANDLES); if (fixAccessibility ()) { ignoreAccessibility = true; @@ -2868,7 +2868,7 @@ public void removeAll () { if (item != null && !item.isDisposed ()) item.release (false); } items = new TreeItem[4]; - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); if (fixAccessibility ()) { ignoreAccessibility = true; @@ -2945,15 +2945,15 @@ public void removeTreeListener(TreeListener listener) { eventTable.unhook (SWT.Collapse, listener); } -void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ height) { +void sendMeasureEvent (long cell, long width, long height) { if (!ignoreSize && GTK.GTK_IS_CELL_RENDERER_TEXT (cell) && hooks (SWT.MeasureItem)) { - long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); + long iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); TreeItem item = null; if (iter != 0) item = _getItem (iter); if (item != null && !item.isDisposed()) { int columnIndex = 0; if (columnCount > 0) { - long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + long columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); for (int i = 0; i < columnCount; i++) { if (columns [i].handle == columnHandle) { columnIndex = i; @@ -2986,8 +2986,8 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh event.gc = gc; Rectangle eventRect = new Rectangle (0, 0, contentWidth [0], contentHeight [0]); event.setBounds (DPIUtil.autoScaleDown (eventRect)); - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long selection = GTK.gtk_tree_view_get_selection (handle); if (GTK.gtk_tree_selection_path_is_selected (selection, path)) { event.detail = SWT.SELECTED; } @@ -3005,8 +3005,8 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh } @Override -long /*int*/ rendererGetPreferredWidthProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ minimun_size, long /*int*/ natural_size) { - long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); +long rendererGetPreferredWidthProc (long cell, long handle, long minimun_size, long natural_size) { + long g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); GtkCellRendererClass klass = new GtkCellRendererClass (); OS.memmove (klass, g_class); OS.call (klass.get_preferred_width, cell, handle, minimun_size, natural_size); @@ -3015,28 +3015,28 @@ long /*int*/ rendererGetPreferredWidthProc (long /*int*/ cell, long /*int*/ hand } @Override -long /*int*/ rendererSnapshotProc (long /*int*/ cell, long /*int*/ snapshot, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { - long /*int*/ rect = Graphene.graphene_rect_alloc(); +long rendererSnapshotProc (long cell, long snapshot, long widget, long background_area, long cell_area, long flags) { + long rect = Graphene.graphene_rect_alloc(); GdkRectangle gdkRectangle = new GdkRectangle (); OS.memmove(gdkRectangle, background_area, GdkRectangle.sizeof); Graphene.graphene_rect_init(rect, gdkRectangle.x, gdkRectangle.y, gdkRectangle.width, gdkRectangle.height); - long /*int*/ cairo = GTK.gtk_snapshot_append_cairo(snapshot, rect); + long cairo = GTK.gtk_snapshot_append_cairo(snapshot, rect); rendererRender (cell, cairo, snapshot, widget, background_area, cell_area, 0, flags); return 0; } @Override -long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ cr, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { +long rendererRenderProc (long cell, long cr, long widget, long background_area, long cell_area, long flags) { rendererRender (cell, cr, 0, widget, background_area, cell_area, 0, flags); return 0; } -void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) { +void rendererRender (long cell, long cr, long snapshot, long widget, long background_area, long cell_area, long expose_area, long flags) { TreeItem item = null; boolean wasSelected = false; - long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); + long iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); if (iter != 0) item = _getItem (iter); - long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + long columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); int columnIndex = 0; if (columnCount > 0) { for (int i = 0; i < columnCount; i++) { @@ -3051,7 +3051,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, ( (GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell) || GTK.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) { drawFlags = (int)/*64*/flags; drawState = SWT.FOREGROUND; - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; GTK.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1); if (ptr [0] == 0) { int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex; @@ -3067,7 +3067,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, } GdkRectangle rect = new GdkRectangle (); - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); GTK.gtk_tree_view_get_background_area (handle, path, columnHandle, rect); GTK.gtk_tree_path_free (path); // Use the x and width information from the Cairo context. See bug 535124. @@ -3093,7 +3093,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, } //send out measure before erase - long /*int*/ textRenderer = getTextRenderer (columnHandle); + long textRenderer = getTextRenderer (columnHandle); if (textRenderer != 0) gtk_cell_renderer_get_preferred_size (textRenderer, handle, null, null); if (hooks (SWT.EraseItem)) { @@ -3163,7 +3163,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, gc.dispose (); } if ((drawState & SWT.FOREGROUND) != 0 || GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell)) { - long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); + long g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); GtkCellRendererClass klass = new GtkCellRendererClass (); OS.memmove (klass, g_class); if (drawForegroundRGBA != null && GTK.GTK_IS_CELL_RENDERER_TEXT (cell)) { @@ -3186,7 +3186,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, if (hooks (SWT.PaintItem)) { if (wasSelected) drawState |= SWT.SELECTED; GdkRectangle rect = new GdkRectangle (); - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter); + long path = GTK.gtk_tree_model_get_path (modelHandle, iter); GTK.gtk_tree_view_get_background_area (handle, path, columnHandle, rect); GTK.gtk_tree_path_free (path); // Use the x and width information from the Cairo context. See bug 535124 and 465309. @@ -3265,7 +3265,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ snapshot, } } -private GC getGC(long /*int*/ cr) { +private GC getGC(long cr) { GC gc; GCData gcData = new GCData(); gcData.cairo = cr; @@ -3279,8 +3279,8 @@ void resetCustomDraw () { for (int i=0; i= OS.VERSION(3, 10, 0)) { hasChildren = true; @@ -3791,7 +3791,7 @@ void setParentGdkResource (Control child) { } } -void setScrollWidth (long /*int*/ column, TreeItem item) { +void setScrollWidth (long column, TreeItem item) { if (columnCount != 0 || currentItem == item) return; int width = GTK.gtk_tree_view_column_get_fixed_width (column); int itemWidth = calculateWidth (column, item.handle, true); @@ -3857,7 +3857,7 @@ public void setSelection (TreeItem [] items) { int length = items.length; if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return; boolean fixColumn = showFirstColumn (); - long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle); + long selection = GTK.gtk_tree_view_get_selection (handle); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); boolean first = true; for (int i = 0; i < length; i++) { @@ -3865,7 +3865,7 @@ public void setSelection (TreeItem [] items) { if (item == null) continue; if (item.isDisposed ()) break; if (item.parent != this) continue; - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle); + long path = GTK.gtk_tree_model_get_path (modelHandle, item.handle); showItem (path, false); if (first) { GTK.gtk_tree_view_set_cursor (handle, path, 0, false); @@ -3960,7 +3960,7 @@ public void setTopItem (TreeItem item) { * Feature in GTK: cache the GtkAdjustment value for future use in * getTopItem(). Set topItem to item. */ - long /*int*/ vAdjustment; + long vAdjustment; vAdjustment = GTK.gtk_scrollable_get_vadjustment(handle); cachedAdjustment = GTK.gtk_adjustment_get_value(vAdjustment); topItem = item; @@ -3968,7 +3968,7 @@ public void setTopItem (TreeItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT); if (item.parent != this) return; - long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle); + long path = GTK.gtk_tree_model_get_path (modelHandle, item.handle); showItem (path, false); GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0); GTK.gtk_tree_path_free (path); @@ -4008,10 +4008,10 @@ boolean showFirstColumn () { */ int columnCount = Math.max (1, this.columnCount); for (int i=0; i 1) { int [] indices = new int [depth - 1]; - long /*int*/ indicesPtr = GTK.gtk_tree_path_get_indices (path); + long indicesPtr = GTK.gtk_tree_path_get_indices (path); C.memmove (indices, indicesPtr, indices.length * 4); - long /*int*/ tempPath = GTK.gtk_tree_path_new (); + long tempPath = GTK.gtk_tree_path_new (); for (int i=0; i index || index > count - 1) return _getBackground (); - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1); if (ptr [0] == 0) return _getBackground (); @@ -246,7 +246,7 @@ boolean _getChecked () { } Color _getForeground () { - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; GTK.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1); if (ptr [0] == 0) return parent.getForeground (); GdkRGBA gdkRGBA = new GdkRGBA (); @@ -258,7 +258,7 @@ Color _getForeground () { Color _getForeground (int index) { int count = Math.max (1, parent.columnCount); if (0 > index || index > count - 1) return _getForeground (); - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1); if (ptr [0] == 0) return _getForeground (); @@ -271,7 +271,7 @@ Color _getForeground (int index) { Image _getImage (int index) { int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return null; - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1); if (ptr [0] == 0) return null; @@ -285,7 +285,7 @@ Image _getImage (int index) { String _getText (int index) { int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return ""; - long /*int*/ [] ptr = new long /*int*/ [1]; + long [] ptr = new long [1]; int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1); if (ptr [0] == 0) return ""; //$NON-NLS-1$ @@ -434,15 +434,15 @@ Rectangle getBoundsInPixels (int index) { // TODO fully test on early and later versions of GTK checkWidget(); if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (index >= 0 && index < parent.columnCount) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); GdkRectangle rect = new GdkRectangle (); GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect); @@ -482,14 +482,14 @@ Rectangle getBoundsInPixels () { // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem checkWidget (); if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, 0); + long parentHandle = parent.handle; + long column = GTK.gtk_tree_view_get_column (parentHandle, 0); if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long pixbufRenderer = parent.getPixbufRenderer (column); if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; @@ -566,7 +566,7 @@ public boolean getChecked () { */ public boolean getExpanded () { checkWidget(); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); boolean answer = GTK.gtk_tree_view_row_expanded (parent.handle, path); GTK.gtk_tree_path_free (path); return answer; @@ -723,18 +723,18 @@ Rectangle getImageBoundsInPixels (int index) { // TODO fully test on early and later versions of GTK checkWidget (); if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (index >= 0 && index < parent.getColumnCount ()) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long pixbufRenderer = parent.getPixbufRenderer (column); if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); GdkRectangle rect = new GdkRectangle (); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect); if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x; @@ -758,7 +758,7 @@ Rectangle getImageBoundsInPixels (int index) { * position of the textRenderer, to ensure images/widgets/etc. aren't placed over the TreeItem's * text. */ - long /*int*/ textRenderer = parent.getTextRenderer (column); + long textRenderer = parent.getTextRenderer (column); if (textRenderer == 0) return new Rectangle (0, 0, 0, 0); int [] xText = new int [1], wText = new int [1]; gtk_tree_view_column_cell_get_position (column, textRenderer, xText, wText); @@ -871,12 +871,12 @@ public Tree getParent () { */ public TreeItem getParentItem () { checkWidget(); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); TreeItem item = null; int depth = GTK.gtk_tree_path_get_depth (path); if (depth > 1) { GTK.gtk_tree_path_up (path); - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); if (GTK.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) { item = parent._getItem (iter); } @@ -946,19 +946,19 @@ Rectangle getTextBoundsInPixels (int index) { if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0); // TODO fully test on early and later versions of GTK // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (index >= 0 && index < parent.columnCount) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long pixbufRenderer = parent.getPixbufRenderer (column); if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); GTK.gtk_widget_realize (parentHandle); boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; @@ -1045,8 +1045,8 @@ public int indexOf (TreeItem item) { if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); int index = -1; boolean isParent = false; - long /*int*/ currentPath = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); - long /*int*/ parentPath = GTK.gtk_tree_model_get_path (parent.modelHandle, item.handle); + long currentPath = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long parentPath = GTK.gtk_tree_model_get_path (parent.modelHandle, item.handle); int depth = GTK.gtk_tree_path_get_depth (parentPath); if (depth > 1 && GTK.gtk_tree_path_up(parentPath)) { if (GTK.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true; @@ -1054,9 +1054,9 @@ public int indexOf (TreeItem item) { GTK.gtk_tree_path_free (currentPath); GTK.gtk_tree_path_free (parentPath); if (!isParent) return index; - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, item.handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, item.handle); if (depth > 1) { - long /*int*/ indices = GTK.gtk_tree_path_get_indices (path); + long indices = GTK.gtk_tree_path_get_indices (path); if (indices != 0) { int[] temp = new int[depth]; C.memmove (temp, indices, 4 * temp.length); @@ -1113,15 +1113,15 @@ public void dispose () { */ public void removeAll () { checkWidget (); - long /*int*/ modelHandle = parent.modelHandle; + long modelHandle = parent.modelHandle; int length = GTK.gtk_tree_model_iter_n_children (modelHandle, handle); if (length == 0) return; - long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); + long iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ()); if (iter == 0) error (SWT.ERROR_NO_HANDLES); if (parent.fixAccessibility ()) { parent.ignoreAccessibility = true; } - long /*int*/ selection = GTK.gtk_tree_view_get_selection (parent.handle); + long selection = GTK.gtk_tree_view_get_selection (parent.handle); int [] value = new int [1]; while (GTK.gtk_tree_model_iter_children (modelHandle, iter, handle)) { GTK.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1); @@ -1207,16 +1207,16 @@ public void setBackground (int index, Color color) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (parent.columnCount > 0) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return; - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long imageRenderer = parent.getPixbufRenderer (column); GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); } @@ -1267,7 +1267,7 @@ public void setChecked (boolean checked) { */ public void setExpanded (boolean expanded) { checkWidget(); - long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); + long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle); if (expanded != GTK.gtk_tree_view_row_expanded (parent.handle, path)) { if (expanded) { OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW); @@ -1311,7 +1311,7 @@ public void setFont (Font font){ if (oldFont == font) return; this.font = font; if (oldFont != null && oldFont.equals (font)) return; - long /*int*/ fontHandle = font != null ? font.handle : 0; + long fontHandle = font != null ? font.handle : 0; GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1); cached = true; } @@ -1352,7 +1352,7 @@ public void setFont (int index, Font font) { if (oldFont != null && oldFont.equals (font)) return; int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; - long /*int*/ fontHandle = font != null ? font.handle : 0; + long fontHandle = font != null ? font.handle : 0; GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1); cached = true; @@ -1360,16 +1360,16 @@ public void setFont (int index, Font font) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (parent.columnCount > 0) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return; - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long imageRenderer = parent.getPixbufRenderer (column); GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); } @@ -1448,16 +1448,16 @@ public void setForeground (int index, Color color){ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - long /*int*/ parentHandle = parent.handle; - long /*int*/ column = 0; + long parentHandle = parent.handle; + long column = 0; if (parent.columnCount > 0) { column = parent.columns [index].handle; } else { column = GTK.gtk_tree_view_get_column (parentHandle, index); } if (column == 0) return; - long /*int*/ textRenderer = parent.getTextRenderer (column); - long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + long textRenderer = parent.getTextRenderer (column); + long imageRenderer = parent.getPixbufRenderer (column); GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); } @@ -1522,7 +1522,7 @@ public void setImage (int index, Image image) { } int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return; - long /*int*/ pixbuf = 0; + long pixbuf = 0; if (image != null) { ImageList imageList = parent.imageList; if (imageList == null) imageList = parent.imageList = new ImageList (); @@ -1548,15 +1548,15 @@ public void setImage (int index, Image image) { */ if ((!parent.ownerDraw) && (image != null) && (DPIUtil.getDeviceZoom() != 100)) { Rectangle imgSize = image.getBounds(); - long /*int*/ scaledPixbuf = GDK.gdk_pixbuf_scale_simple(pixbuf, imgSize.width, imgSize.height, GDK.GDK_INTERP_BILINEAR); + long scaledPixbuf = GDK.gdk_pixbuf_scale_simple(pixbuf, imgSize.width, imgSize.height, GDK.GDK_INTERP_BILINEAR); if (scaledPixbuf !=0) { pixbuf = scaledPixbuf; } } } long /*int*/parentHandle = parent.handle; - long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, index); - long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + long column = GTK.gtk_tree_view_get_column (parentHandle, index); + long pixbufRenderer = parent.getPixbufRenderer (column); int [] currentWidth = new int [1]; int [] currentHeight= new int [1]; GTK.gtk_cell_renderer_get_fixed_size (pixbufRenderer, currentWidth, currentHeight); diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java index 11bb0f16fd..330efeeef3 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java @@ -61,7 +61,7 @@ public abstract class Widget { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; int style, state; Display display; EventTable eventTable; @@ -346,15 +346,15 @@ public void addDisposeListener (DisposeListener listener) { addListener (SWT.Dispose, typedListener); } -long /*int*/ paintWindow () { +long paintWindow () { return 0; } -long /*int*/ paintSurface () { +long paintSurface () { return 0; } -long /*int*/ cssHandle() { +long cssHandle() { return handle; } @@ -370,7 +370,7 @@ static int checkBits (int style, int int0, int int1, int int2, int int3, int int return style; } -long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) { +long cellDataProc (long tree_column, long cell, long tree_model, long iter, long data) { return 0; } @@ -486,7 +486,7 @@ void deregister () { } void destroyWidget () { - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); releaseHandle (); if (topHandle != 0 && (state & HANDLE) != 0) { GTK.gtk_widget_destroy (topHandle); @@ -685,11 +685,11 @@ public int getStyle () { } -long /*int*/ gtk_activate (long /*int*/ widget) { +long gtk_activate (long widget) { return 0; } -void gtk_adjustment_get (long /*int*/ hAdjustment, GtkAdjustment adjustment) { +void gtk_adjustment_get (long hAdjustment, GtkAdjustment adjustment) { adjustment.lower = GTK.gtk_adjustment_get_lower (hAdjustment); adjustment.upper = GTK.gtk_adjustment_get_upper (hAdjustment); adjustment.page_increment = GTK.gtk_adjustment_get_page_increment (hAdjustment); @@ -698,139 +698,139 @@ void gtk_adjustment_get (long /*int*/ hAdjustment, GtkAdjustment adjustment) { adjustment.value = GTK.gtk_adjustment_get_value (hAdjustment); } -long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_press_event (long widget, long event) { return 0; } -long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { +long gtk_button_release_event (long widget, long event) { return 0; } -long /*int*/ gtk_gesture_press_event (long /*int*/ gesture, int n_press, double x, double y, long /*int*/ event) { +long gtk_gesture_press_event (long gesture, int n_press, double x, double y, long event) { return 0; } -long /*int*/ gtk_gesture_release_event (long /*int*/ gesture, int n_press, double x, double y, long /*int*/ event) { +long gtk_gesture_release_event (long gesture, int n_press, double x, double y, long event) { return 0; } -long /*int*/ gtk_changed (long /*int*/ widget) { +long gtk_changed (long widget) { return 0; } -long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) { +long gtk_change_value (long widget, long scroll, long value1, long value2) { return 0; } -long /*int*/ gtk_clicked (long /*int*/ widget) { +long gtk_clicked (long widget) { return 0; } -long /*int*/ gtk_close_request (long /*int*/ widget) { +long gtk_close_request (long widget) { return 0; } -long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) { +long gtk_commit (long imcontext, long text) { return 0; } -long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) { +long gtk_configure_event (long widget, long event) { return 0; } -long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) { +long gtk_create_menu_proxy (long widget) { return 0; } -long /*int*/ gtk_day_selected (long /*int*/ widget) { +long gtk_day_selected (long widget) { return 0; } -long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) { +long gtk_day_selected_double_click (long widget) { return 0; } -long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) { +long gtk_delete_event (long widget, long event) { return 0; } -long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*int*/ iter2) { +long gtk_delete_range (long widget, long iter1, long iter2) { return 0; } -long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) { +long gtk_delete_text (long widget, long start_pos, long end_pos) { return 0; } -long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_enter_notify_event (long widget, long event) { return 0; } -long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { +long gtk_event (long widget, long event) { return 0; } -long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ event) { +long gtk_event_after (long widget, long event) { return 0; } -long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ logical, long /*int*/ expand, long /*int*/ open_all) { +long gtk_expand_collapse_cursor_row (long widget, long logical, long expand, long open_all) { return 0; } -long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) { +long gtk_draw (long widget, long cairo) { return 0; } -long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ event) { +long gtk_focus (long widget, long event) { return 0; } -long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_in_event (long widget, long event) { return 0; } -long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { +long gtk_focus_out_event (long widget, long event) { return 0; } -long /*int*/ gtk_grab_focus (long /*int*/ widget) { +long gtk_grab_focus (long widget) { return 0; } -long /*int*/ gtk_hide (long /*int*/ widget) { +long gtk_hide (long widget) { return 0; } -long /*int*/ gtk_icon_release (long /*int*/ widget, long /*int*/ icon_pos, long /*int*/ event) { +long gtk_icon_release (long widget, long icon_pos, long event) { return 0; } -long /*int*/ gtk_input (long /*int*/ widget, long /*int*/ arg1) { +long gtk_input (long widget, long arg1) { return 0; } -long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) { +long gtk_insert_text (long widget, long new_text, long new_text_length, long position) { return 0; } -long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_press_event (long widget, long event) { return sendKeyEvent (SWT.KeyDown, event) ? 0 : 1; } -long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) { +long gtk_key_release_event (long widget, long event) { return sendKeyEvent (SWT.KeyUp, event) ? 0 : 1; } -long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_leave_notify_event (long widget, long event) { return 0; } -long /*int*/ gtk_map (long /*int*/ widget) { +long gtk_map (long widget) { return 0; } -long /*int*/ gtk_map_event (long /*int*/ widget, long /*int*/ event) { +long gtk_map_event (long widget, long event) { return 0; } @@ -851,126 +851,126 @@ long /*int*/ gtk_map_event (long /*int*/ widget, long /*int*/ event) { * @param flipped_x a boolean flag indicating whether the menu has been inverted along the X-axis * @param flipped_y a boolean flag indicating whether the menu has been inverted along the Y-axis */ -long /*int*/ gtk_menu_popped_up (long /*int*/ widget, long /*int*/ flipped_rect, long /*int*/ final_rect, long /*int*/ flipped_x, long /*int*/ flipped_y) { +long gtk_menu_popped_up (long widget, long flipped_rect, long final_rect, long flipped_x, long flipped_y) { return 0; } -long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) { +long gtk_mnemonic_activate (long widget, long arg1) { return 0; } -long /*int*/ gtk_month_changed (long /*int*/ widget) { +long gtk_month_changed (long widget) { return 0; } -long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { +long gtk_motion_notify_event (long widget, long event) { return 0; } -long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ event) { +long gtk_move_focus (long widget, long event) { return 0; } -long /*int*/ gtk_output (long /*int*/ widget) { +long gtk_output (long widget) { return 0; } -long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { +long gtk_populate_popup (long widget, long menu) { return 0; } -long /*int*/ gtk_popup_menu (long /*int*/ widget) { +long gtk_popup_menu (long widget) { return 0; } -long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { +long gtk_preedit_changed (long imcontext) { return 0; } -long /*int*/ gtk_realize (long /*int*/ widget) { +long gtk_realize (long widget) { return 0; } -long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) { +long gtk_row_activated (long tree, long path, long column) { return 0; // Note on SWT Tree/Table/List. This signal is no longer used for sending events, instead // Send DefaultSelection is manually emitted. We use this function to know whether a // 'row-activated' is triggered. See Bug 312568, 518414. } -long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) { +long gtk_row_deleted (long model, long path) { return 0; } -long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) { +long gtk_row_inserted (long model, long path, long iter) { return 0; } -long /*int*/ gtk_row_has_child_toggled (long /*int*/ model, long /*int*/ path, long /*int*/ iter) { +long gtk_row_has_child_toggled (long model, long path, long iter) { return 0; } -long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) { +long gtk_scroll_child (long widget, long scrollType, long horizontal) { return 0; } -long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ event) { +long gtk_scroll_event (long widget, long event) { return 0; } -long /*int*/ gtk_select (long /*int*/ item) { +long gtk_select (long item) { return 0; } -long /*int*/ gtk_selection_done (long /*int*/ menushell) { +long gtk_selection_done (long menushell) { return 0; } -long /*int*/ gtk_show (long /*int*/ widget) { +long gtk_show (long widget) { return 0; } -long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) { +long gtk_show_help (long widget, long helpType) { return 0; } -long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { +long gtk_size_allocate (long widget, long allocation) { return 0; } -long /*int*/ gtk_status_icon_popup_menu (long /*int*/ handle, long /*int*/ button, long /*int*/ activate_time) { +long gtk_status_icon_popup_menu (long handle, long button, long activate_time) { return 0; } -long /*int*/ gtk_start_interactive_search (long /*int*/ widget) { +long gtk_start_interactive_search (long widget) { return 0; } -long /*int*/ gtk_style_updated (long /*int*/ widget) { +long gtk_style_updated (long widget) { return 0; } -long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) { +long gtk_switch_page (long widget, long page, long page_num) { return 0; } -long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) { +long gtk_test_collapse_row (long tree, long iter, long path) { return 0; } -long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) { +long gtk_test_expand_row (long tree, long iter, long path) { return 0; } -long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter, long /*int*/ text, long /*int*/ length) { +long gtk_text_buffer_insert_text (long widget, long iter, long text, long length) { return 0; } -long /*int*/ gtk_timer () { +long gtk_timer () { return 0; } -long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) { +long gtk_toggled (long renderer, long pathStr) { return 0; } @@ -979,44 +979,44 @@ long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) { * if there is an ongoing MeasureEvent listener. Disabling it and re-enabling the callback after the method is called * prevents a stack overflow from occurring. */ -boolean gtk_tree_view_column_cell_get_position (long /*int*/ column, long /*int*/ cell_renderer, int[] start_pos, int[] width) { +boolean gtk_tree_view_column_cell_get_position (long column, long cell_renderer, int[] start_pos, int[] width) { Callback.setEnabled(false); boolean result = GTK.gtk_tree_view_column_cell_get_position (column, cell_renderer, start_pos, width); Callback.setEnabled(true); return result; } -long /*int*/ gtk_unmap (long /*int*/ widget) { +long gtk_unmap (long widget) { return 0; } -long /*int*/ gtk_unmap_event (long /*int*/ widget, long /*int*/ event) { +long gtk_unmap_event (long widget, long event) { return 0; } -long /*int*/ gtk_unrealize (long /*int*/ widget) { +long gtk_unrealize (long widget) { return 0; } -long /*int*/ gtk_value_changed (long /*int*/ adjustment) { +long gtk_value_changed (long adjustment) { return 0; } -long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) { +long gtk_window_state_event (long widget, long event) { return 0; } -int fontHeight (long /*int*/ font, long /*int*/ widgetHandle) { - long /*int*/ context = GTK.gtk_widget_get_pango_context (widgetHandle); - long /*int*/ lang = OS.pango_context_get_language (context); - long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang); +int fontHeight (long font, long widgetHandle) { + long context = GTK.gtk_widget_get_pango_context (widgetHandle); + long lang = OS.pango_context_get_language (context); + long metrics = OS.pango_context_get_metrics (context, font, lang); int ascent = OS.pango_font_metrics_get_ascent (metrics); int descent = OS.pango_font_metrics_get_descent (metrics); OS.pango_font_metrics_unref (metrics); return OS.PANGO_PIXELS (ascent + descent); } -long /*int*/ filterProc(long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) { +long filterProc(long xEvent, long gdkEvent, long data2) { return 0; } @@ -1153,11 +1153,11 @@ boolean hooks (int eventType) { return eventTable.hooks (eventType); } -long /*int*/ hoverProc (long /*int*/ widget) { +long hoverProc (long widget) { return 0; } -boolean mnemonicHit (long /*int*/ mnemonicHandle, char key) { +boolean mnemonicHit (long mnemonicHandle, char key) { if (!mnemonicMatch (mnemonicHandle, key)) return false; OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE); boolean result = GTK.gtk_widget_mnemonic_activate (mnemonicHandle, false); @@ -1165,7 +1165,7 @@ boolean mnemonicHit (long /*int*/ mnemonicHandle, char key) { return result; } -boolean mnemonicMatch (long /*int*/ mnemonicHandle, char key) { +boolean mnemonicMatch (long mnemonicHandle, char key) { long keyval1 = GDK.gdk_keyval_to_lower (GDK.gdk_unicode_to_keyval (key)); long keyval2 = GDK.gdk_keyval_to_lower (GTK.gtk_label_get_mnemonic_keyval (mnemonicHandle)); return keyval1 == keyval2; @@ -1313,15 +1313,15 @@ protected void removeListener (int eventType, SWTEventListener handler) { eventTable.unhook (eventType, handler); } -long /*int*/ rendererGetPreferredWidthProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ minimun_size, long /*int*/ natural_size) { +long rendererGetPreferredWidthProc (long cell, long handle, long minimun_size, long natural_size) { return 0; } -long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ cr, long /*int*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { +long rendererRenderProc (long cell, long cr, long handle, long background_area, long cell_area, long flags) { return 0; } -long /*int*/ rendererSnapshotProc (long /*int*/ cell, long /*int*/ snapshot, long /*int*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) { +long rendererSnapshotProc (long cell, long snapshot, long handle, long background_area, long cell_area, long flags) { return 0; } @@ -1428,11 +1428,11 @@ void sendEvent (int eventType, Event event, boolean send) { } } -boolean sendKeyEvent (int type, long /*int*/ event) { +boolean sendKeyEvent (int type, long event) { int length; - long /*int*/ string; + long string; if (GTK.GTK4) { - long /*int*/ [] eventString = new long /*int*/ [1]; + long [] eventString = new long [1]; GDK.gdk_event_get_string(event, eventString); string = eventString[0]; length = (int)/*64*/OS.g_utf16_strlen (string, -1); @@ -1464,9 +1464,9 @@ boolean sendKeyEvent (int type, long /*int*/ event) { return sendIMKeyEvent (type, event, chars) != null; } -char [] sendIMKeyEvent (int type, long /*int*/ event, char [] chars) { +char [] sendIMKeyEvent (int type, long event, char [] chars) { int index = 0, count = 0, state = 0; - long /*int*/ ptr = 0; + long ptr = 0; if (event == 0) { ptr = GTK.gtk_get_current_event (); if (ptr != 0) { @@ -1533,7 +1533,7 @@ void sendSelectionEvent (int eventType, Event event, boolean send) { return; } if (event == null) event = new Event (); - long /*int*/ ptr = GTK.gtk_get_current_event (); + long ptr = GTK.gtk_get_current_event (); if (ptr != 0) { int currentEventType = GDK.gdk_event_get_event_type(ptr); currentEventType = Control.fixGdkEventTypeValues(currentEventType); @@ -1671,8 +1671,8 @@ public void setData (String key, Object value) { } if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL); if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) && key.equals(KEY_GTK_CSS) && value instanceof String) { - long /*int*/ context = GTK.gtk_widget_get_style_context (cssHandle()); - long /*int*/ provider = GTK.gtk_css_provider_new(); + long context = GTK.gtk_widget_get_style_context (cssHandle()); + long provider = GTK.gtk_css_provider_new(); if (context != 0 && provider != 0) { GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_USER); if (GTK.GTK4) { @@ -1685,9 +1685,9 @@ public void setData (String key, Object value) { } } -void setFontDescription (long /*int*/ widget, long /*int*/ font) { +void setFontDescription (long widget, long font) { GTK.gtk_widget_override_font (widget, font); - long /*int*/ context = GTK.gtk_widget_get_style_context (widget); + long context = GTK.gtk_widget_get_style_context (widget); GTK.gtk_style_context_invalidate (context); } @@ -1712,8 +1712,8 @@ boolean setInputState (Event event, int state) { return true; } -boolean setKeyState (Event javaEvent, long /*int*/ event) { - long /*int*/ string; +boolean setKeyState (Event javaEvent, long event) { + long string; int length; int [] eventKeyval = new int[1]; int group; @@ -1721,7 +1721,7 @@ boolean setKeyState (Event javaEvent, long /*int*/ event) { int [] eventState = new int[1]; GDK.gdk_event_get_state(event, eventState); if (GTK.GTK4) { - long /*int*/ [] eventString = new long /*int*/ [1]; + long [] eventString = new long [1]; GDK.gdk_event_get_string(event, eventString); string = eventString[0]; length = (int)/*64*/OS.g_utf16_strlen (string, -1); @@ -1757,8 +1757,8 @@ boolean setKeyState (Event javaEvent, long /*int*/ event) { if (!groupLatinKeysCount.containsKey(group)) { group = display.getLatinKeyGroup(); } - long /*int*/ keymap = 0; - long /*int*/ display = GDK.gdk_display_get_default(); + long keymap = 0; + long display = GDK.gdk_display_get_default(); if (GTK.GTK4) { keymap = GDK.gdk_display_get_keymap(display); } else { @@ -1789,7 +1789,7 @@ boolean setKeyState (Event javaEvent, long /*int*/ event) { return setInputState (javaEvent, eventState[0]); } -void setLocationState (Event event, long /*int*/ eventPtr) { +void setLocationState (Event event, long eventPtr) { int [] eventKeyval = new int[1]; GDK.gdk_event_get_keyval(eventPtr, eventKeyval); switch (eventKeyval[0]) { @@ -1847,15 +1847,15 @@ boolean setTabItemFocus (boolean next) { return false; } -long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long shellMapProc (long handle, long arg0, long user_data) { return 0; } -long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long sizeAllocateProc (long handle, long arg0, long user_data) { return 0; } -long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long sizeRequestProc (long handle, long arg0, long user_data) { return 0; } @@ -1866,12 +1866,12 @@ long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int * @param handle the widget receiving the snapshot * @param snapshot the actual GtkSnapshot */ -void snapshotToDraw (long /*int*/ handle, long /*int*/ snapshot) { +void snapshotToDraw (long handle, long snapshot) { GtkAllocation allocation = new GtkAllocation (); GTK.gtk_widget_get_allocation(handle, allocation); - long /*int*/ rect = Graphene.graphene_rect_alloc(); + long rect = Graphene.graphene_rect_alloc(); Graphene.graphene_rect_init(rect, 0, 0, allocation.width, allocation.height); - long /*int*/ cairo = GTK.gtk_snapshot_append_cairo(snapshot, rect); + long cairo = GTK.gtk_snapshot_append_cairo(snapshot, rect); gtk_draw(handle, cairo); Graphene.graphene_rect_free(rect); // Propagates the snapshot down the widget hierarchy so that other widgets @@ -1878,17 +1878,17 @@ return; } -long /*int*/ gtk_widget_get_window (long /*int*/ widget){ +long gtk_widget_get_window (long widget){ GTK.gtk_widget_realize(widget); return GTK.gtk_widget_get_window (widget); } -long /*int*/ gtk_widget_get_surface (long /*int*/ widget){ +long gtk_widget_get_surface (long widget){ GTK.gtk_widget_realize(widget); return GTK.gtk_widget_get_surface (widget); } -void gtk_widget_set_has_surface_or_window (long /*int*/ widget, boolean has) { +void gtk_widget_set_has_surface_or_window (long widget, boolean has) { if (GTK.GTK4) { if (has && OS.G_OBJECT_TYPE(widget) == OS.swt_fixed_get_type()) { return; @@ -1898,7 +1898,7 @@ void gtk_widget_set_has_surface_or_window (long /*int*/ widget, boolean has) { } } -boolean gtk_widget_get_has_surface_or_window (long /*int*/ widget) { +boolean gtk_widget_get_has_surface_or_window (long widget) { if (GTK.GTK4) { return GTK.gtk_widget_get_has_surface(widget); } else { @@ -1906,16 +1906,16 @@ boolean gtk_widget_get_has_surface_or_window (long /*int*/ widget) { } } -void gtk_widget_set_visible (long /*int*/ widget, boolean visible) { +void gtk_widget_set_visible (long widget, boolean visible) { GTK.gtk_widget_set_visible (widget, visible); } -void gdk_window_get_size (long /*int*/ drawable, int[] width, int[] height) { +void gdk_window_get_size (long drawable, int[] width, int[] height) { width[0] = GDK.gdk_window_get_width (drawable); height[0] = GDK.gdk_window_get_height (drawable); } -void gdk_surface_get_size (long /*int*/ surface, int[] width, int[] height) { +void gdk_surface_get_size (long surface, int[] width, int[] height) { width[0] = GDK.gdk_surface_get_width (surface); height[0] = GDK.gdk_surface_get_height (surface); } @@ -1926,7 +1926,7 @@ void gdk_surface_get_size (long /*int*/ surface, int[] width, int[] height) { * * @param event the event to be freed */ -void gdk_event_free (long /*int*/ event) { +void gdk_event_free (long event) { if (event == 0) return; if (GTK.GTK4) { OS.g_object_unref(event); @@ -1942,7 +1942,7 @@ void gdk_event_free (long /*int*/ event) { * @param event the event whose window or surface to fetch * @return the GdkWindow or GdkSurface associated with the event */ -long /*int*/ gdk_event_get_surface_or_window(long /*int*/ event) { +long gdk_event_get_surface_or_window(long event) { if (event == 0) return 0; if (GTK.GTK4) { return GDK.gdk_event_get_surface(event); @@ -1972,20 +1972,20 @@ long /*int*/ gdk_event_peek() { * @return the keymask to be used with constants like * OS.GDK_SHIFT_MASK / OS.GDK_CONTROL_MASK / OS.GDK_MOD1_MASK etc.. */ -int gdk_event_get_state (long /*int*/ event) { +int gdk_event_get_state (long event) { int [] state = new int [1]; GDK.gdk_event_get_state (event, state); return state[0]; } -long /*int*/ gtk_box_new (int orientation, boolean homogeneous, int spacing) { - long /*int*/ box = GTK.gtk_box_new (orientation, spacing); +long gtk_box_new (int orientation, boolean homogeneous, int spacing) { + long box = GTK.gtk_box_new (orientation, spacing); GTK.gtk_box_set_homogeneous (box, homogeneous); return box; } -void gtk_box_set_child_packing (long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type) { +void gtk_box_set_child_packing (long box, long child, boolean expand, boolean fill, int padding, int pack_type) { if (GTK.GTK4) { GTK.gtk_widget_set_hexpand(child, expand); GTK.gtk_widget_set_vexpand(child, expand); @@ -2015,8 +2015,8 @@ void gtk_box_pack_end (long /*int*/ box, long /*int*/ child, boolean expand, boo } } -int gdk_pointer_grab (long /*int*/ gdkResource, int grab_ownership, boolean owner_events, int event_mask, long /*int*/ confine_to, long /*int*/ cursor, int time_) { - long /*int*/ display = 0; +int gdk_pointer_grab (long gdkResource, int grab_ownership, boolean owner_events, int event_mask, long confine_to, long cursor, int time_) { + long display = 0; if (GTK.GTK4) { if( gdkResource != 0) { display = GDK.gdk_surface_get_display (gdkResource); @@ -2030,31 +2030,31 @@ int gdk_pointer_grab (long /*int*/ gdkResource, int grab_ownership, boolean owne } } if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { - long /*int*/ seat = GDK.gdk_display_get_default_seat(display); + long seat = GDK.gdk_display_get_default_seat(display); if (gdkSeatGrabPrepareFunc == null) { gdkSeatGrabPrepareFunc = new Callback(Widget.class, "GdkSeatGrabPrepareFunc", 3); //$NON-NLS-1$ } - long /*int*/ gdkSeatGrabPrepareFuncAddress = gdkSeatGrabPrepareFunc.getAddress(); + long gdkSeatGrabPrepareFuncAddress = gdkSeatGrabPrepareFunc.getAddress(); if (gdkSeatGrabPrepareFuncAddress == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); return GDK.gdk_seat_grab(seat, gdkResource, GDK.GDK_SEAT_CAPABILITY_ALL_POINTING, owner_events, cursor, 0, gdkSeatGrabPrepareFuncAddress, gdkResource); } else { - long /*int*/ pointer = GDK.gdk_get_pointer(display); + long pointer = GDK.gdk_get_pointer(display); return GDK.gdk_device_grab (pointer, gdkResource, grab_ownership, owner_events, event_mask, cursor, time_); } } -void gdk_pointer_ungrab (long /*int*/ gdkResource, int time_) { - long /*int*/ display = GTK.GTK4? GDK.gdk_surface_get_display(gdkResource) : GDK.gdk_window_get_display (gdkResource); +void gdk_pointer_ungrab (long gdkResource, int time_) { + long display = GTK.GTK4? GDK.gdk_surface_get_display(gdkResource) : GDK.gdk_window_get_display (gdkResource); if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { - long /*int*/ seat = GDK.gdk_display_get_default_seat(display); + long seat = GDK.gdk_display_get_default_seat(display); GDK.gdk_seat_ungrab(seat); } else { - long /*int*/ pointer = GDK.gdk_get_pointer(display); + long pointer = GDK.gdk_get_pointer(display); GDK.gdk_device_ungrab (pointer, time_); } } -static long /*int*/ GdkSeatGrabPrepareFunc (long /*int*/ gdkSeat, long /*int*/ gdkResource, long /*int*/ userData_gdkResource) { +static long GdkSeatGrabPrepareFunc (long gdkSeat, long gdkResource, long userData_gdkResource) { if (userData_gdkResource != 0) { if (GTK.GTK4) { GDK.gdk_surface_show(userData_gdkResource); @@ -2081,11 +2081,11 @@ public String toString () { return getName () + " {" + string + "}"; } -long /*int*/ topHandle () { +long topHandle () { return handle; } -long /*int*/ timerProc (long /*int*/ widget) { +long timerProc (long widget) { return 0; } @@ -2093,9 +2093,9 @@ boolean translateTraversal (int event) { return false; } -long /*int*/ enterMotionScrollProc (long /*int*/ handle, double x, double y, long /*int*/ user_data) { - long /*int*/ event = GTK.gtk_get_current_event(); - long /*int*/ result = 0; +long enterMotionScrollProc (long handle, double x, double y, long user_data) { + long event = GTK.gtk_get_current_event(); + long result = 0; switch ((int)/*64*/user_data) { case ENTER: result = gtk_enter_notify_event(handle, event); @@ -2114,9 +2114,9 @@ long /*int*/ enterMotionScrollProc (long /*int*/ handle, double x, double y, lon return result; } -long /*int*/ focusProc (long /*int*/ handle, long /*int*/ user_data) { - long /*int*/ event = GTK.gtk_get_current_event(); - long /*int*/ result = 0; +long focusProc (long handle, long user_data) { + long event = GTK.gtk_get_current_event(); + long result = 0; switch ((int)/*64*/user_data) { case FOCUS_IN: result = gtk_focus_in_event(handle, event); @@ -2129,9 +2129,9 @@ long /*int*/ focusProc (long /*int*/ handle, long /*int*/ user_data) { return result; } -long /*int*/ keyPressReleaseProc (long /*int*/ handle, int keyval, int keycode, int state, long /*int*/ user_data) { - long /*int*/ event = GTK.gtk_get_current_event(); - long /*int*/ result = 0; +long keyPressReleaseProc (long handle, int keyval, int keycode, int state, long user_data) { + long event = GTK.gtk_get_current_event(); + long result = 0; switch ((int)/*64*/user_data) { case KEY_PRESSED: result = gtk_key_press_event(handle, event); @@ -2144,9 +2144,9 @@ long /*int*/ keyPressReleaseProc (long /*int*/ handle, int keyval, int keycode, return result; } -long /*int*/ getsurePressReleaseProc (long /*int*/ gesture, int n_press, double x, double y, long /*int*/ user_data) { - long /*int*/ event = GTK.gtk_get_current_event(); - long /*int*/ result = 0; +long getsurePressReleaseProc (long gesture, int n_press, double x, double y, long user_data) { + long event = GTK.gtk_get_current_event(); + long result = 0; switch ((int)/*64*/user_data) { case GESTURE_PRESSED: result = gtk_gesture_press_event(gesture, n_press, x, y, event); @@ -2159,9 +2159,9 @@ long /*int*/ getsurePressReleaseProc (long /*int*/ gesture, int n_press, double return result; } -long /*int*/ leaveProc (long /*int*/ handle, long /*int*/ user_data) { - long /*int*/ event = GTK.gtk_get_current_event(); - long /*int*/ result = 0; +long leaveProc (long handle, long user_data) { + long event = GTK.gtk_get_current_event(); + long result = 0; switch ((int)/*64*/user_data) { case LEAVE: result = gtk_leave_notify_event(handle, event); @@ -2171,7 +2171,7 @@ long /*int*/ leaveProc (long /*int*/ handle, long /*int*/ user_data) { return result; } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { +long windowProc (long handle, long user_data) { switch ((int)/*64*/user_data) { case ACTIVATE: return gtk_activate (handle); case CHANGED: return gtk_changed (handle); @@ -2204,7 +2204,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { } } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long user_data) { switch ((int)/*64*/user_data) { case EXPOSE_EVENT_INVERSE: { if (GTK.GTK_IS_CONTAINER (handle)) { @@ -2254,7 +2254,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us } } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long user_data) { switch ((int)/*64*/user_data) { case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1); case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1); @@ -2271,7 +2271,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ ar } } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long arg2, long user_data) { switch ((int)/*64*/user_data) { case CHANGE_VALUE: return gtk_change_value (handle, arg0, arg1, arg2); case EXPAND_COLLAPSE_CURSOR_ROW: return gtk_expand_collapse_cursor_row (handle, arg0, arg1, arg2); @@ -2281,25 +2281,25 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ ar } } -long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { +long windowProc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { switch ((int)/*64*/user_data) { case POPPED_UP: return gtk_menu_popped_up (handle, arg0, arg1, arg2, arg3); default: return 0; } } -void gtk_cell_renderer_get_preferred_size (long /*int*/ cell, long /*int*/ widget, int[] width, int[] height) { +void gtk_cell_renderer_get_preferred_size (long cell, long widget, int[] width, int[] height) { GtkRequisition minimum_size = new GtkRequisition (); GTK.gtk_cell_renderer_get_preferred_size (cell, widget, minimum_size, null); if (width != null) width [0] = minimum_size.width; if (height != null) height[0] = minimum_size.height; } -void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisition){ +void gtk_widget_get_preferred_size (long widget, GtkRequisition requisition){ GTK.gtk_widget_get_preferred_size (widget, requisition, null); } -void gtk_image_set_from_gicon (long /*int*/ imageHandle, long /*int*/ pixbuf){ +void gtk_image_set_from_gicon (long imageHandle, long pixbuf){ GTK.gtk_image_set_from_gicon(imageHandle, pixbuf, GTK.GTK_ICON_SIZE_SMALL_TOOLBAR); } /** @@ -2309,7 +2309,7 @@ void gtk_image_set_from_gicon (long /*int*/ imageHandle, long /*int*/ pixbuf){ * @param handle * @return amount of space around the outside of the container. */ -int gtk_container_get_border_width_or_margin (long /*int*/ handle) { +int gtk_container_get_border_width_or_margin (long handle) { if (GTK.GTK4) { int marginTop = GTK.gtk_widget_get_margin_top(handle); int marginBottom = GTK.gtk_widget_get_margin_bottom(handle); @@ -2325,7 +2325,7 @@ int gtk_container_get_border_width_or_margin (long /*int*/ handle) { * @param handle * @param border_width */ -void gtk_container_set_border_width (long /*int*/ handle, int border_width) { +void gtk_container_set_border_width (long handle, int border_width) { if (GTK.GTK4) { GTK.gtk_widget_set_margin_top(handle, border_width); GTK.gtk_widget_set_margin_bottom(handle, border_width); diff --git a/eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java b/eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java index 9c1222e333..949a49cecc 100644 --- a/eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java +++ b/eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java @@ -146,7 +146,7 @@ } private static void appendCairoMatrix(PaintEvent event, StringBuilder clipping) { - long /*int*/ cairo = cairo(event); + long cairo = cairo(event); clipping.append("Cairo Matrix: "); if (cairo != 0) { double[] matrix = new double[6]; @@ -189,7 +189,7 @@ return null; } - private static long /*int*/ cairo(PaintEvent event) { + private static long cairo(PaintEvent event) { GC gc = gc(event); if (gc != null) { if (event.gc != null) { -- cgit v1.2.3