Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Williams2019-03-26 10:02:00 -0400
committerEric Williams2019-03-26 14:00:30 -0400
commit4ce8a195ba3ace07f48c5d2da637f513a3e56db9 (patch)
tree349a6ab65a4d6f84fdf42f4586a9fbd4d7143552
parent1e2e1e226eceeee889f564c1f3edfae534aab204 (diff)
downloadeclipse.platform.swt-4ce8a195ba3ace07f48c5d2da637f513a3e56db9.tar.gz
eclipse.platform.swt-4ce8a195ba3ace07f48c5d2da637f513a3e56db9.tar.xz
eclipse.platform.swt-4ce8a195ba3ace07f48c5d2da637f513a3e56db9.zip
Bug 545793: [GTK] Remove 32-bit code
Remove /*int*/ casts. Change-Id: I9e8da81d6435312acdd06cd1b3e471275ca842a8 Signed-off-by: Eric Williams <ericwill@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java436
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java20
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java42
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java18
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c34
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java36
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c398
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c18
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h18
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java456
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c317
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c70
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h70
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java44
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c640
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c114
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h114
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c758
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c6699
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c418
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h418
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c336
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java140
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java48
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java72
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java44
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java804
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java2990
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/Graphene.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java1304
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java28
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java56
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java44
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c1112
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c92
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java388
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java78
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java634
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java20
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java62
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java180
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java38
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java90
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java36
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java32
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java52
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java46
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java202
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java140
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java466
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java52
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java44
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java454
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java46
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java20
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java28
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java28
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java200
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java66
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java178
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java36
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java128
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java46
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java410
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java38
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java94
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java204
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java92
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java46
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java440
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java38
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java112
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java330
-rw-r--r--tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java4
153 files changed, 10967 insertions, 13855 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
index 18c0ddf914..a23412d396 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
index 5065b925d2..283dc2bb8b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index a1561eb788..1f4b047869 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/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<LONG, AccessibleObject> 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<AccessibleControlListener> 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<AccessibleTextExtendedListener> 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<AccessibleTextExtendedListener> 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<AccessibleTextExtendedListener> 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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java
index 6bc6c755a1..43389526ad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
index 635196b225..8dbffe1c41 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
index aa8b181f11..197cc62103 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
index 1048dd809e..6870ec56a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
index 8cd3ac61bf..c2d3bb191f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
index f21305b2c2..0c55180d39 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java
index 1e95136f2c..ce49bb8953 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java
index 609b82cde1..34fa8fee05 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java
index 240ac68b23..d6ca939272 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
index 5c919d329f..af900f9731 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/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; i<count; i++) {
- long /*int*/ path = OS.g_list_data (list);
+ long path = OS.g_list_data (list);
GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
icons[i] = GTK.gtk_tree_view_create_row_drag_icon(handle, path);
switch (Cairo.cairo_surface_get_type(icons[i])) {
@@ -135,9 +135,9 @@ public class TableDragSourceEffect extends DragSourceEffect {
list = OS.g_list_next (list);
GTK.gtk_tree_path_free (path);
}
- long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
+ long surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
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_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
for (int i=0; i<count; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
index 75b7597b4c..8b14b6f23b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
@@ -106,7 +106,7 @@ public class TableDropTargetEffect extends DropTargetEffect {
@Override
public void dragLeave(DropTargetEvent event) {
Table table = (Table) control;
- long /*int*/ handle = table.handle;
+ long handle = table.handle;
GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
@@ -133,15 +133,15 @@ public class TableDropTargetEffect extends DropTargetEffect {
@Override
public void dragOver(DropTargetEvent event) {
Table table = (Table) control;
- long /*int*/ handle = table.handle;
+ long handle = table.handle;
int effect = checkEffect(event.feedback);
Point coordinates = new Point(event.x, event.y);
coordinates = DPIUtil.autoScaleUp(table.toControl(coordinates));
- long /*int*/ [] path = new long /*int*/ [1];
+ long [] path = new long [1];
GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
int index = -1;
if (path[0] != 0) {
- long /*int*/ indices = GTK.gtk_tree_path_get_indices (path[0]);
+ long indices = GTK.gtk_tree_path_get_indices (path[0]);
if (indices != 0) {
int[] temp = new int[1];
C.memmove (temp, indices, 4);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
index 4154029a44..a78ce8bccf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
@@ -89,7 +89,7 @@ public void javaToNative (Object object, TransferData transferData) {
transferData.result = 1;
}
if (transferData.type == UTF8_STRING_ID) {
- long /*int*/ pValue = OS.g_malloc(utf8.length);
+ long pValue = OS.g_malloc(utf8.length);
if (pValue == 0) return;
C.memmove(pValue, utf8, utf8.length);
transferData.type = UTF8_STRING_ID;
@@ -99,7 +99,7 @@ public void javaToNative (Object object, TransferData transferData) {
transferData.result = 1;
}
if (transferData.type == STRING_ID) {
- long /*int*/ string_target = GDK.gdk_utf8_to_string_target(utf8);
+ long string_target = GDK.gdk_utf8_to_string_target(utf8);
if (string_target == 0) return;
transferData.type = STRING_ID;
transferData.format = 8;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java
index 637e0bf559..b718c66a99 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java
@@ -43,7 +43,7 @@ public class TransferData {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public long /*int*/ type;
+ public long type;
/**
* Specifies the number of units in pValue.
@@ -89,7 +89,7 @@ public class TransferData {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public long /*int*/ pValue;
+ public long pValue;
/**
* The result field contains the result of converting a
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index 02be6a35a8..d48a177f1c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -93,28 +93,28 @@ public class TreeDragSourceEffect extends DragSourceEffect {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
- long /*int*/ handle = tree.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 = tree.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 = tree.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; i<count; i++) {
- long /*int*/ path = OS.g_list_data (list);
+ long path = OS.g_list_data (list);
GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
icons[i] = GTK.gtk_tree_view_create_row_drag_icon(handle, path);
switch (Cairo.cairo_surface_get_type(icons[i])) {
@@ -134,9 +134,9 @@ public class TreeDragSourceEffect extends DragSourceEffect {
list = OS.g_list_next (list);
GTK.gtk_tree_path_free (path);
}
- long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
+ long surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
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_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
for (int i=0; i<count; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
index 01111f31e6..0f77fc0774 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
@@ -116,7 +116,7 @@ public class TreeDropTargetEffect extends DropTargetEffect {
@Override
public void dragLeave(DropTargetEvent event) {
Tree tree = (Tree) control;
- long /*int*/ handle = tree.handle;
+ long handle = tree.handle;
GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
@@ -148,14 +148,14 @@ public class TreeDropTargetEffect extends DropTargetEffect {
Tree tree = (Tree) control;
int effect = checkEffect(event.feedback);
- long /*int*/ handle = tree.handle;
+ long handle = tree.handle;
Point coordinates = new Point(event.x, event.y);
coordinates = DPIUtil.autoScaleUp(tree.toControl(coordinates));
- long /*int*/ [] path = new long /*int*/ [1];
+ long [] path = new long [1];
GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
int index = -1;
if (path[0] != 0) {
- long /*int*/ indices = GTK.gtk_tree_path_get_indices(path[0]);
+ long indices = GTK.gtk_tree_path_get_indices(path[0]);
if (indices != 0) {
int depth = GTK.gtk_tree_path_get_depth(path[0]);
int[] temp = new int[depth];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java
index 08f893d826..6fdbb76ddd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java
@@ -71,7 +71,7 @@ public void javaToNative (Object object, TransferData transferData){
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
int byteCount = chars.length*2;
- long /*int*/ pValue = OS.g_malloc(byteCount);
+ long pValue = OS.g_malloc(byteCount);
if (pValue == 0) return;
C.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java
index 928f15726d..ef66e050ce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java
@@ -90,28 +90,28 @@ public class ListDragSourceEffect extends DragSourceEffect {
//TEMPORARY CODE
if (dragList.isListening(SWT.EraseItem) || dragList.isListening (SWT.PaintItem)) return null;
- long /*int*/ handle = dragList.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 = dragList.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 = dragList.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; i<count; i++) {
- long /*int*/ path = OS.g_list_data (list);
+ long path = OS.g_list_data (list);
GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
icons[i] = GTK.gtk_tree_view_create_row_drag_icon(handle, path);
switch (Cairo.cairo_surface_get_type(icons[i])) {
@@ -131,9 +131,9 @@ public class ListDragSourceEffect extends DragSourceEffect {
list = OS.g_list_next (list);
GTK.gtk_tree_path_free (path);
}
- long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
+ long surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
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_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
for (int i=0; i<count; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
index fae4e87d20..42596993d8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.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
@@ -60,14 +60,14 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glViewport)
#endif
#ifndef NO__1glXChooseVisual
-JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXChooseVisual)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2)
+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXChooseVisual)
+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2)
{
jint *lparg2=NULL;
- jintLong rc = 0;
+ jlong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXChooseVisual_FUNC);
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(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/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
index 97b951c846..921053631b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java
index b3738d2a8d..b2a7d92283 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
index 602acad9fb..c0fc008e73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
index 214b8e6bb0..ad4b67c116 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
index 7f86efa77c..1347d62edb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
index 3380e8170c..08adfd2b69 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
index 98cdbcc2e8..ae4bcf5afe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
index dfde96d249..290c73b83d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index d9b3bec2e7..86a280dfaa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java
index 29b54e6fd5..15b929c15e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
index ab782ed88b..8543a5b651 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c
index f7c4632529..ed4d3f9b60 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h
index 434d081a00..311a251d92 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java
index c2a45cf15f..1abd49ca47 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java
index f693119985..182ced004e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
index 9385081133..d3e6c3dbe4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
index 61f2fa373f..3ebce3a6d4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
index cd9187eb4e..5d5f089d90 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c
index 6c04b64cdc..a0b6c2cb19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c
+++ b/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/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index da4b0a2dc1..4a562b022d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/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);
@@ -788,7 +744,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);
@@ -798,7 +754,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);
@@ -807,18 +763,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);
@@ -828,7 +784,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1display_1get_1primary_1monitor)
#ifndef NO__1gdk_1display_1is_1composited
JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1display_1is_1composited)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jboolean rc = 0;
GDK_NATIVE_ENTER(env, that, _1gdk_1display_1is_1composited_FUNC);
@@ -839,12 +795,12 @@ JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1display_1is_1composited)
#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 jintLong JNICALL GDK_NATIVE(_1gdk_1display_1peek_1event)
#ifndef NO__1gdk_1display_1put_1event
JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1display_1put_1event)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
GDK_NATIVE_ENTER(env, that, _1gdk_1display_1put_1event_FUNC);
gdk_display_put_event((GdkDisplay *)arg0, (const GdkEvent *)arg1);
@@ -862,7 +818,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;
@@ -2315,7 +2271,7 @@ fail:
#ifndef NO__1gdk_1surface_1get_1state
JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1state)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jint rc = 0;
GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1state_FUNC);
@@ -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);
@@ -2406,7 +2362,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1move)
#ifndef NO__1gdk_1surface_1move_1resize
JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_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_1surface_1move_1resize_FUNC);
gdk_surface_move_resize((GdkSurface *)arg0, arg1, arg2, arg3, arg4);
@@ -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, (gint)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);